[Dart-dev] DART/branches Revision: 11209

[dart at ucar.edu]

hendric at ucar.edu
2017-03-07 10:28:50 -0700 (Tue, 07 Mar 2017)
127
fixing path names for mkmf to direct towards build_templates and
not mkmf.  Also cleaning up the logic for building with MPI.




Modified: DART/branches/rma_rearrange/models/lorenz_96/work/mkmf_closest_member_tool
===================================================================
--- DART/branches/rma_rearrange/models/lorenz_96/work/mkmf_closest_member_tool	2017-03-07 17:04:49 UTC (rev 11208)
+++ DART/branches/rma_rearrange/models/lorenz_96/work/mkmf_closest_member_tool	2017-03-07 17:28:50 UTC (rev 11209)
@@ -6,7 +6,7 @@
 #
 # DART $Id$
 
-../../../mkmf/mkmf -p closest_member_tool -t ../../../mkmf/mkmf.template   \
+../../../build_templates/mkmf -p closest_member_tool -t ../../../build_templates/mkmf.template   \
  -a "../../.." path_names_closest_member_tool
 
 exit $status

Modified: DART/branches/rma_rearrange/models/lorenz_96/work/mkmf_create_fixed_network_seq
===================================================================
--- DART/branches/rma_rearrange/models/lorenz_96/work/mkmf_create_fixed_network_seq	2017-03-07 17:04:49 UTC (rev 11208)
+++ DART/branches/rma_rearrange/models/lorenz_96/work/mkmf_create_fixed_network_seq	2017-03-07 17:28:50 UTC (rev 11209)
@@ -6,7 +6,7 @@
 #
 # DART $Id$
 
-../../../mkmf/mkmf -p create_fixed_network_seq -t ../../../mkmf/mkmf.template   \
+../../../build_templates/mkmf -p create_fixed_network_seq -t ../../../build_templates/mkmf.template   \
  -a "../../.." path_names_create_fixed_network_seq
 
 exit $status

Modified: DART/branches/rma_rearrange/models/lorenz_96/work/mkmf_create_obs_sequence
===================================================================
--- DART/branches/rma_rearrange/models/lorenz_96/work/mkmf_create_obs_sequence	2017-03-07 17:04:49 UTC (rev 11208)
+++ DART/branches/rma_rearrange/models/lorenz_96/work/mkmf_create_obs_sequence	2017-03-07 17:28:50 UTC (rev 11209)
@@ -6,7 +6,7 @@
 #
 # DART $Id$
 
-../../../mkmf/mkmf -p create_obs_sequence -t ../../../mkmf/mkmf.template   \
+../../../build_templates/mkmf -p create_obs_sequence -t ../../../build_templates/mkmf.template   \
  -a "../../.." path_names_create_obs_sequence
 
 exit $status

Modified: DART/branches/rma_rearrange/models/lorenz_96/work/mkmf_fill_inflation_restart
===================================================================
--- DART/branches/rma_rearrange/models/lorenz_96/work/mkmf_fill_inflation_restart	2017-03-07 17:04:49 UTC (rev 11208)
+++ DART/branches/rma_rearrange/models/lorenz_96/work/mkmf_fill_inflation_restart	2017-03-07 17:28:50 UTC (rev 11209)
@@ -6,7 +6,7 @@
 #
 # DART $Id$
 
-../../../mkmf/mkmf -p fill_inflation_restart -t ../../../mkmf/mkmf.template   \
+../../../build_templates/mkmf -p fill_inflation_restart -t ../../../build_templates/mkmf.template   \
  -a "../../.." path_names_fill_inflation_restart
 
 exit $status

Modified: DART/branches/rma_rearrange/models/lorenz_96/work/mkmf_filter
===================================================================
--- DART/branches/rma_rearrange/models/lorenz_96/work/mkmf_filter	2017-03-07 17:04:49 UTC (rev 11208)
+++ DART/branches/rma_rearrange/models/lorenz_96/work/mkmf_filter	2017-03-07 17:28:50 UTC (rev 11209)
@@ -37,9 +37,8 @@
 
   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
 
@@ -47,24 +46,23 @@
 
   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
 rm -f path_names_filter.back