[Dart-dev] DART/branches Revision: 11227

[dart at ucar.edu]

hendric at ucar.edu
2017-03-07 12:02:22 -0700 (Tue, 07 Mar 2017)
28
fixing paths for lorenz_96




Modified: DART/branches/rma_rearrange/models/lorenz_96/work/input.nml
===================================================================
--- DART/branches/rma_rearrange/models/lorenz_96/work/input.nml	2017-03-07 18:59:59 UTC (rev 11226)
+++ DART/branches/rma_rearrange/models/lorenz_96/work/input.nml	2017-03-07 19:02:22 UTC (rev 11227)
@@ -150,11 +150,11 @@
 
 &preprocess_nml
           overwrite_output = .true.,
-    input_obs_def_mod_file = '../../../obs_def/DEFAULT_obs_def_mod.F90',
-   output_obs_def_mod_file = '../../../obs_def/obs_def_mod.f90',
-   input_obs_kind_mod_file = '../../../obs_kind/DEFAULT_obs_kind_mod.F90',
-  output_obs_kind_mod_file = '../../../obs_kind/obs_kind_mod.f90',
-               input_files = '../../../obs_def/obs_def_1d_state_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_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_files = '../../../observations/forward_operators/obs_def_1d_state_mod.f90',
    /
 
 &obs_sequence_tool_nml

Modified: DART/branches/rma_rearrange/models/lorenz_96/work/input.workshop.nml
===================================================================
--- DART/branches/rma_rearrange/models/lorenz_96/work/input.workshop.nml	2017-03-07 18:59:59 UTC (rev 11226)
+++ DART/branches/rma_rearrange/models/lorenz_96/work/input.workshop.nml	2017-03-07 19:02:22 UTC (rev 11227)
@@ -153,11 +153,11 @@
 
 &preprocess_nml
           overwrite_output = .true.,
-    input_obs_def_mod_file = '../../../obs_def/DEFAULT_obs_def_mod.F90',
-   output_obs_def_mod_file = '../../../obs_def/obs_def_mod.f90',
-   input_obs_kind_mod_file = '../../../obs_kind/DEFAULT_obs_kind_mod.F90',
-  output_obs_kind_mod_file = '../../../obs_kind/obs_kind_mod.f90',
-               input_files = '../../../obs_def/obs_def_1d_state_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_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_files = '../../../observations/forward_operators/obs_def_1d_state_mod.f90',
    /
 
 &obs_sequence_tool_nml

Modified: DART/branches/rma_rearrange/models/lorenz_96/work/mkmf_perfect_model_obs
===================================================================
--- DART/branches/rma_rearrange/models/lorenz_96/work/mkmf_perfect_model_obs	2017-03-07 18:59:59 UTC (rev 11226)
+++ DART/branches/rma_rearrange/models/lorenz_96/work/mkmf_perfect_model_obs	2017-03-07 19:02:22 UTC (rev 11227)
@@ -59,8 +59,6 @@
 
 endif
 
-endif
-
 # remove temp file and now really call mkmf to generate makefile
 rm -f path_names_perfect_model_obs.back
 

Modified: DART/branches/rma_rearrange/models/lorenz_96/work/path_names_closest_member_tool
===================================================================
--- DART/branches/rma_rearrange/models/lorenz_96/work/path_names_closest_member_tool	2017-03-07 18:59:59 UTC (rev 11226)
+++ DART/branches/rma_rearrange/models/lorenz_96/work/path_names_closest_member_tool	2017-03-07 19:02:22 UTC (rev 11227)
@@ -1,30 +1,30 @@
-adaptive_inflate/adaptive_inflate_mod.f90
-assim_model/assim_model_mod.f90
-assim_tools/assim_tools_mod.f90
-common/types_mod.f90
-cov_cutoff/cov_cutoff_mod.f90
-distributed/distributed_state_mod.f90
-distributed/null_win_mod.f90
-ensemble_manager/ensemble_manager_mod.f90
-io/dart_time_io_mod.f90
-io/direct_netcdf_mod.f90
-io/io_filenames_mod.f90
-io/state_space_diag_mod.f90
-io/state_structure_mod.f90
-io/state_vector_io_mod.f90
-location/oned/location_mod.f90
+assimilation_code/modules/assimilation/adaptive_inflate_mod.f90
+assimilation_code/modules/assimilation/assim_model_mod.f90
+assimilation_code/modules/assimilation/assim_tools_mod.f90
+assimilation_code/modules/utilities/types_mod.f90
+assimilation_code/modules/assimilation/cov_cutoff_mod.f90
+assimilation_code/modules/utilities/distributed_state_mod.f90
+assimilation_code/modules/utilities/null_win_mod.f90
+assimilation_code/modules/utilities/ensemble_manager_mod.f90
+assimilation_code/modules/io/dart_time_io_mod.f90
+assimilation_code/modules/io/direct_netcdf_mod.f90
+assimilation_code/modules/io/io_filenames_mod.f90
+assimilation_code/modules/io/state_space_diag_mod.f90
+assimilation_code/modules/io/state_structure_mod.f90
+assimilation_code/modules/io/state_vector_io_mod.f90
+assimilation_code/location/oned/location_mod.f90
 models/lorenz_96/model_mod.f90
-mpi_utilities/null_mpi_utilities_mod.f90
-obs_def/obs_def_mod.f90
-obs_kind/obs_kind_mod.f90
-obs_sequence/obs_sequence_mod.f90
-quality_control/quality_control_mod.f90
-random_seq/random_seq_mod.f90
-reg_factor/reg_factor_mod.f90