[Dart-dev] DART/branches Revision: 10875

[dart at ucar.edu]

thoar at ucar.edu
2017-01-13 11:23:01 -0700 (Fri, 13 Jan 2017)
179
Removed unused assim_model_mod.nml and associated bits.
Removed references to nonexistent state_space_diag namelist.
The CICE assimilate script now supports the fixed filenames.




Modified: DART/branches/rma_fixed_filenames/assim_model/assim_model_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/assim_model/assim_model_mod.f90	2017-01-13 18:16:15 UTC (rev 10874)
+++ DART/branches/rma_fixed_filenames/assim_model/assim_model_mod.f90	2017-01-13 18:23:01 UTC (rev 10875)
@@ -16,12 +16,7 @@
 use time_manager_mod, only : time_type,                                            &
                              operator(<), operator(>), operator(+), operator(-),   &
                              operator(/), operator(*), operator(==), operator(/=)
-use utilities_mod, only : register_module, error_handler,                          &
-                          E_ERR, E_WARN, E_MSG, E_DBG, nmlfileunit,                &
-                          dump_unit_attributes, find_namelist_in_file,             &
-                          check_namelist_read, do_nml_file, do_nml_term,           &
-                          set_output,                                              &
-                          ascii_file_format, set_output
+use utilities_mod, only : register_module
 use     model_mod, only : get_model_size, static_init_model, get_state_meta_data,  &
                           get_model_time_step, init_conditions,                    &
                           init_time, adv_1step, end_model,                         &

Deleted: DART/branches/rma_fixed_filenames/assim_model/assim_model_mod.nml
===================================================================
--- DART/branches/rma_fixed_filenames/assim_model/assim_model_mod.nml	2017-01-13 18:16:15 UTC (rev 10874)
+++ DART/branches/rma_fixed_filenames/assim_model/assim_model_mod.nml	2017-01-13 18:23:01 UTC (rev 10875)
@@ -1,4 +0,0 @@
-&assim_model_nml
-   netCDF_large_file_support  = .false.
-  /
-

Deleted: DART/branches/rma_fixed_filenames/io/state_space_diag_mod.nml
===================================================================
--- DART/branches/rma_fixed_filenames/io/state_space_diag_mod.nml	2017-01-13 18:16:15 UTC (rev 10874)
+++ DART/branches/rma_fixed_filenames/io/state_space_diag_mod.nml	2017-01-13 18:23:01 UTC (rev 10875)
@@ -1,5 +0,0 @@
-&state_space_diag_nml
-   single_file                = .true.
-   make_diagnostic_files      = .true.
-   netCDF_large_file_support  = .true.
-/

Modified: DART/branches/rma_fixed_filenames/models/cice/shell_scripts/assimilate1_5.csh
===================================================================
--- DART/branches/rma_fixed_filenames/models/cice/shell_scripts/assimilate1_5.csh	2017-01-13 18:16:15 UTC (rev 10874)
+++ DART/branches/rma_fixed_filenames/models/cice/shell_scripts/assimilate1_5.csh	2017-01-13 18:23:01 UTC (rev 10875)
@@ -245,20 +245,6 @@
 set  PRIOR_TF = `echo $MYSTRING[2] | tr '[:upper:]' '[:lower:]'`
 set  POSTE_TF = `echo $MYSTRING[3] | tr '[:upper:]' '[:lower:]'`
 
-# its a little tricky to remove both styles of quotes from the string.
-
-set  MYSTRING = `grep 'inf_in_file_name' input.nml`
-set  MYSTRING = `echo $MYSTRING | sed -e "s#[=,'\.]# #g"`
-set  MYSTRING = `echo $MYSTRING | sed -e 's#"# #g'`
-set  PRIOR_INF_IFBASE = $MYSTRING[2]
-set  POSTE_INF_IFBASE = $MYSTRING[3]
-
-set  MYSTRING = `grep 'inf_out_file_name' input.nml`
-set  MYSTRING = `echo $MYSTRING | sed -e "s#[=,'\.]# #g"`
-set  MYSTRING = `echo $MYSTRING | sed -e 's#"# #g'`
-set  PRIOR_INF_OFBASE = $MYSTRING[2]
-set  POSTE_INF_OFBASE = $MYSTRING[3]
-
 # IFF we want PRIOR inflation:
 
 if ( $PRIOR_INF > 0 ) then
@@ -289,29 +275,29 @@
       
       # Checking for a prior inflation mean file to use
       
-      (ls -rt1 ../cice.${PRIOR_INF_OFBASE}_mean.* | tail -n 1 >! latestfile) > & /dev/null
+      (ls -rt1 ../cice.output_priorinf_mean.* | tail -n 1 >! latestfile) > & /dev/null
       set nfiles = `cat latestfile | wc -l`
 
       if ( $nfiles > 0 ) then
          set latest = `cat latestfile`
-         ${LINK} $latest ${PRIOR_INF_IFBASE}_mean.nc
+         ${LINK} $latest input_priorinf_mean _mean.nc
       else
          echo "ERROR: Requested PRIOR inflation but specified no incoming inflation MEAN file."
-         echo "ERROR: expected something like ../cice.${PRIOR_INF_OFBASE}_mean.YYYY-MM-DD-SSSSS.nc"
+         echo "ERROR: expected something like ../cice.output_priorinf_mean.YYYY-MM-DD-SSSSS.nc"
          exit 2
       endif
 
       # Checking for a prior inflation sd file to use
 
-      (ls -rt1 ../cice.${PRIOR_INF_OFBASE}_sd.* | tail -n 1 >! latestfile) > & /dev/null
+      (ls -rt1 ../cice.output_priorinf_sd.* | tail -n 1 >! latestfile) > & /dev/null
       set nfiles = `cat latestfile | wc -l`
 
       if ( $nfiles > 0 ) then
          set latest = `cat latestfile`
-         ${LINK} $latest ${PRIOR_INF_IFBASE}_sd.nc
+         ${LINK} $latest input_priorinf_sd.nc
       else
          echo "ERROR: Requested PRIOR inflation but specified no incoming inflation SD file."
-         echo "ERROR: expected something like ../cice.${PRIOR_INF_OFBASE}_sd.YYYY-MM-DD-SSSSS.nc"
+         echo "ERROR: expected something like ../cice.input_priorinf_sd.YYYY-MM-DD-SSSSS.nc"
          exit 2
       endif