[Dart-dev] DART/branches Revision: 12279

[dart at ucar.edu]

nancy at ucar.edu
2018-01-04 11:24:01 -0700 (Thu, 04 Jan 2018)
133
the code and default nml file still had the old locations
of the DEFAULT and output files - the docs were updated
but not the code.




Modified: DART/branches/recam/assimilation_code/programs/preprocess/preprocess.f90
===================================================================
--- DART/branches/recam/assimilation_code/programs/preprocess/preprocess.f90	2018-01-04 17:44:21 UTC (rev 12278)
+++ DART/branches/recam/assimilation_code/programs/preprocess/preprocess.f90	2018-01-04 18:24:01 UTC (rev 12279)
@@ -109,14 +109,14 @@
 ! relative to the working directory in which preprocess is being executed
 ! and these files are used to fill in observation kind details in
 ! DEFAULT_obs_def_mod.f90 and DEFAULT_obs_kind_mod.f90.
-character(len = 129) :: input_obs_def_mod_file = &
-                        '../../../obs_def/DEFAULT_obs_def_mod.F90'
-character(len = 129) :: output_obs_def_mod_file = &
-                        '../../../obs_def/obs_def_mod.f90'
-character(len = 129) :: input_obs_kind_mod_file = &
-                        '../../../obs_kind/DEFAULT_obs_kind_mod.F90'
-character(len = 129) :: output_obs_kind_mod_file = &
-                        '../../../obs_kind/obs_kind_mod.f90'
+character(len=129) ::     input_obs_def_mod_file = &
+                   '../../../observations/forward_operators/DEFAULT_obs_def_mod.F90'
+character(len=129) ::    output_obs_def_mod_file = &
+                   '../../../observations/forward_operators/obs_def_mod.f90'
+character(len=129) ::    input_obs_kind_mod_file = &
+                   '../../../assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90'
+character(len=129) ::   output_obs_kind_mod_file = &
+                   '../../../assimilation_code/modules/observations/obs_kind_mod.f90'
 character(len = 129) :: input_files(max_input_files) = 'null'
 character(len = 129) :: model_files(max_model_files) = 'null'
 logical              :: overwrite_output = .true.

Modified: DART/branches/recam/assimilation_code/programs/preprocess/preprocess.html
===================================================================
--- DART/branches/recam/assimilation_code/programs/preprocess/preprocess.html	2018-01-04 17:44:21 UTC (rev 12278)
+++ DART/branches/recam/assimilation_code/programs/preprocess/preprocess.html	2018-01-04 18:24:01 UTC (rev 12279)
@@ -118,7 +118,7 @@
    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/null
+               input_files = '../../../observations/forward_operators/null'
  /
 </pre>
 </div>

Modified: DART/branches/recam/assimilation_code/programs/preprocess/preprocess.nml
===================================================================
--- DART/branches/recam/assimilation_code/programs/preprocess/preprocess.nml	2018-01-04 17:44:21 UTC (rev 12278)
+++ DART/branches/recam/assimilation_code/programs/preprocess/preprocess.nml	2018-01-04 18:24:01 UTC (rev 12279)
@@ -1,8 +1,8 @@
 &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_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 = '../../../obs_def/null',
  /