[Dart-dev] DART/branches Revision: 11217

[dart at ucar.edu]

hendric at ucar.edu
2017-03-07 11:13:16 -0700 (Tue, 07 Mar 2017)
38
simplifying and correcting MPI logic




Modified: DART/branches/rma_rearrange/models/bgrid_solo/work/mkmf_filter
===================================================================
--- DART/branches/rma_rearrange/models/bgrid_solo/work/mkmf_filter	2017-03-07 18:05:30 UTC (rev 11216)
+++ DART/branches/rma_rearrange/models/bgrid_solo/work/mkmf_filter	2017-03-07 18:13:16 UTC (rev 11217)
@@ -37,28 +37,28 @@
 
   echo "Making Makefile with MPI"
   touch using_mpi_for_filter
-  sed -e 's;/null_mpi_util;/mpi_util;' path_names_filter.back >! path_names_filter
-  cp -f path_names_filter path_names_filter.temp
-  sed -e 's;/null_win_mod;/no_cray_win_mod;' path_names_filter.temp >! path_names_filter
+  sed -e 's#/null_mpi_util#/mpi_util#' \
+      -e 's#/null_win_mod#/no_cray_win_mod#' path_names_filter.back >! path_names_filter
 
+
   setenv wrapper_arg -w
 
 else
 
   echo "Making Makefile without MPI"
   rm -f using_mpi_for_filter
-  sed -e 's;/mpi_util;/null_mpi_util;' path_names_filter.back >! path_names_filter
-  setenv wrapper_arg ""
-  cp -f path_names_filter path_names_filter.temp
-  sed '\,distributed/no_cray_win_mod,d' path_names_filter.temp >! path_names_filter
-  cp -f path_names_filter path_names_filter.temp
-  sed '\,distributed/cray_win_mod,d' path_names_filter.temp >! path_names_filter
-  set p=`grep distributed/null_win_mod.f90 path_names_filter | wc -w`
+  sed -e 's#/mpi_util#/null_mpi_util#' \
+      -e '\#no_cray_win_mod.f90#d' \
+      -e '\#cray_win_mod.f90#d' path_names_filter.back >! path_names_filter
+
+  set p=`grep null_win_mod.f90 path_names_filter | wc -w`
   if ( $p == 0) then
-  #  echo distributed/null_win_mod.f90 >> path_names_filter
-     echo 'distributed/null_win_mod.f90' | cat - path_names_filter > temp && mv temp path_names_filter
+     echo assimilation_code/modules/utilities/null_win_mod.f90 >> path_names_filter
   endif
 
+  setenv wrapper_arg ""
+
+
 endif
 
 # remove temp file and now really call mkmf to generate makefile

Modified: DART/branches/rma_rearrange/models/bgrid_solo/work/mkmf_model_mod_check
===================================================================
--- DART/branches/rma_rearrange/models/bgrid_solo/work/mkmf_model_mod_check	2017-03-07 18:05:30 UTC (rev 11216)
+++ DART/branches/rma_rearrange/models/bgrid_solo/work/mkmf_model_mod_check	2017-03-07 18:13:16 UTC (rev 11217)
@@ -37,9 +37,8 @@
 
   echo "Making Makefile with MPI"
   touch using_mpi_for_model_mod_check
-  sed -e 's;/null_mpi_util;/mpi_util;' path_names_model_mod_check.back >! path_names_model_mod_check
-  cp -f path_names_model_mod_check path_names_model_mod_check.temp
-  sed -e 's;/null_win_mod;/no_cray_win_mod;' path_names_model_mod_check.temp >! path_names_model_mod_check
+  sed -e 's#/null_mpi_util#/mpi_util#' \
+      -e 's#/null_win_mod#/no_cray_win_mod#' path_names_model_mod_check.back >! path_names_model_mod_check
 
   setenv wrapper_arg -w
 
@@ -47,18 +46,17 @@
 
   echo "Making Makefile without MPI"
   rm -f using_mpi_for_model_mod_check
-  sed -e 's;/mpi_util;/null_mpi_util;' path_names_model_mod_check.back >! path_names_model_mod_check
-  setenv wrapper_arg ""
-  cp -f path_names_model_mod_check path_names_model_mod_check.temp
-  sed '\,distributed/no_cray_win_mod,d' path_names_model_mod_check.temp >! path_names_model_mod_check
-  cp -f path_names_model_mod_check path_names_model_mod_check.temp
-  sed '\,distributed/cray_win_mod,d' path_names_model_mod_check.temp >! path_names_model_mod_check
-  set p=`grep distributed/null_win_mod.f90 path_names_model_mod_check | wc -w`
+  sed -e 's#/mpi_util#/null_mpi_util#' \
+      -e '\#no_cray_win_mod.f90#d' \
+      -e '\#cray_win_mod.f90#d' path_names_model_mod_check.back >! path_names_model_mod_check
+
+  set p=`grep null_win_mod.f90 path_names_model_mod_check | wc -w`
   if ( $p == 0) then
-  #  echo distributed/null_win_mod.f90 >> path_names_model_mod_check
-     echo 'distributed/null_win_mod.f90' | cat - path_names_model_mod_check > temp && mv temp path_names_model_mod_check
+     echo assimilation_code/modules/utilities/null_win_mod.f90 >> path_names_model_mod_check
   endif
 
+  setenv wrapper_arg ""
+
 endif
 
 # remove temp file and now really call mkmf to generate makefile

Modified: DART/branches/rma_rearrange/models/bgrid_solo/work/mkmf_perfect_model_obs
===================================================================
--- DART/branches/rma_rearrange/models/bgrid_solo/work/mkmf_perfect_model_obs	2017-03-07 18:05:30 UTC (rev 11216)
+++ DART/branches/rma_rearrange/models/bgrid_solo/work/mkmf_perfect_model_obs	2017-03-07 18:13:16 UTC (rev 11217)
@@ -37,9 +37,8 @@
 
   echo "Making Makefile with MPI"
   touch using_mpi_for_perfect_model_obs
-  sed -e 's;/null_mpi_util;/mpi_util;' path_names_perfect_model_obs.back >! path_names_perfect_model_obs
-  cp -f path_names_perfect_model_obs path_names_perfect_model_obs.temp
-  sed -e 's;/null_win_mod;/no_cray_win_mod;' path_names_perfect_model_obs.temp >! path_names_perfect_model_obs