[Dart-dev] DART/branches Revision: 11226
dart at ucar.edu
dart at ucar.edu
Tue Mar 7 12:00:02 MST 2017
hendric at ucar.edu
2017-03-07 11:59:59 -0700 (Tue, 07 Mar 2017)
24
changing paths for POP
Modified: DART/branches/rma_rearrange/models/POP/work/input.nml
===================================================================
--- DART/branches/rma_rearrange/models/POP/work/input.nml 2017-03-07 18:51:26 UTC (rev 11225)
+++ DART/branches/rma_rearrange/models/POP/work/input.nml 2017-03-07 18:59:59 UTC (rev 11226)
@@ -138,11 +138,11 @@
/
&preprocess_nml
- input_obs_kind_mod_file = '../../../obs_kind/DEFAULT_obs_kind_mod.F90'
- output_obs_kind_mod_file = '../../../obs_kind/obs_kind_mod.f90'
- input_obs_def_mod_file = '../../../obs_def/DEFAULT_obs_def_mod.F90'
- output_obs_def_mod_file = '../../../obs_def/obs_def_mod.f90'
- input_files = '../../../obs_def/obs_def_ocean_mod.f90'
+ input_obs_kind_mod_file = '../../../assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90'
+ output_obs_kind_mod_file = '../../../assimilation_code/modules/observations/obs_kind_mod.f90'
+ input_obs_def_mod_file = '../../../observations/forward_operators/DEFAULT_obs_def_mod.F90'
+ output_obs_def_mod_file = '../../../observations/forward_operators/obs_def_mod.f90'
+ input_files = '../../../observations/forward_operators/obs_def_ocean_mod.f90'
/
&model_nml
Modified: DART/branches/rma_rearrange/models/POP/work/mkmf_create_fixed_network_seq
===================================================================
--- DART/branches/rma_rearrange/models/POP/work/mkmf_create_fixed_network_seq 2017-03-07 18:51:26 UTC (rev 11225)
+++ DART/branches/rma_rearrange/models/POP/work/mkmf_create_fixed_network_seq 2017-03-07 18:59:59 UTC (rev 11226)
@@ -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/POP/work/mkmf_create_obs_sequence
===================================================================
--- DART/branches/rma_rearrange/models/POP/work/mkmf_create_obs_sequence 2017-03-07 18:51:26 UTC (rev 11225)
+++ DART/branches/rma_rearrange/models/POP/work/mkmf_create_obs_sequence 2017-03-07 18:59:59 UTC (rev 11226)
@@ -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/POP/work/mkmf_filter
===================================================================
--- DART/branches/rma_rearrange/models/POP/work/mkmf_filter 2017-03-07 18:51:26 UTC (rev 11225)
+++ DART/branches/rma_rearrange/models/POP/work/mkmf_filter 2017-03-07 18:59:59 UTC (rev 11226)
@@ -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
-../../../mkmf/mkmf -p filter -t ../../../mkmf/mkmf.template \
+../../../build_templates/mkmf -p filter -t ../../../build_templates/mkmf.template \
-a "../../.." ${wrapper_arg} path_names_filter
exit $status
More information about the Dart-dev
mailing list