[Dart-dev] DART/branches Revision: 10888

[dart at ucar.edu]

thoar at ucar.edu
2017-01-13 15:06:15 -0700 (Fri, 13 Jan 2017)
165
ROMS will now cycle with the fixed filenames.

The convert_roms_obs.f90 has some better error reporting
that helps determine what input file is throwing the error.




Modified: DART/branches/rma_fixed_filenames/models/ROMS/shell_scripts/cycle.csh.template
===================================================================
--- DART/branches/rma_fixed_filenames/models/ROMS/shell_scripts/cycle.csh.template	2017-01-13 22:05:05 UTC (rev 10887)
+++ DART/branches/rma_fixed_filenames/models/ROMS/shell_scripts/cycle.csh.template	2017-01-13 22:06:15 UTC (rev 10888)
@@ -243,8 +243,7 @@
 
       if ( $nfiles > 0 ) then
          set latest = `cat latestfile`
-      #  \cp -v $latest input_priorinf_mean.nc
-         \cp -v $latest input_priorinf_mean
+         \ln -vs $latest input_priorinf_mean.nc
       else
          echo "ERROR: Requested PRIOR inflation but specified no incoming inflation MEAN file."
          echo "ERROR: expected something like output_priorinf_mean.SSSSS.nc"
@@ -258,8 +257,7 @@
 
       if ( $nfiles > 0 ) then
          set latest = `cat latestfile`
-      #  \cp -v $latest input_priorinf_sd.nc
-         \cp -v $latest input_priorinf_sd
+         \ln -vs $latest input_priorinf_sd.nc
       else
          echo "ERROR: Requested PRIOR inflation but specified no incoming inflation SD file."
          echo "ERROR: expected something like output_priorinf_sd.SSSSS.nc"
@@ -303,8 +301,7 @@
 
       if ( $nfiles > 0 ) then
          set latest = `cat latestfile`
-      #  \cp -v $latest input_postinf_mean.nc
-         \cp -v $latest input_postinf_mean
+         \ln -vs $latest input_postinf_mean.nc
       else
          echo "ERROR: Requested POSTERIOR inflation but specified no incoming inflation MEAN file."
          echo "ERROR: expected something like output_postinf_mean.SSSSS.nc"
@@ -318,8 +315,7 @@
 
       if ( $nfiles > 0 ) then
          set latest = `cat latestfile`
-      #  \cp -v $latest input_postinf_sd.nc
-         \cp -v $latest input_postinf_sd
+         \ln -vs $latest input_postinf_sd.nc
       else
          echo "ERROR: Requested POSTERIOR inflation but specified no incoming inflation SD file."
          echo "ERROR: expected something like output_postinf_sd.SSSSS.nc"
@@ -364,23 +360,24 @@
 
 mpirun.lsf ./filter || exit 3
 
-# Tag the state output with the valid time of the model state.
+# Tag the output with the valid time of the model state.
 
-\mv -v PriorDiag_mean.nc         input_mean.${OCEAN_TIME}.nc
-\mv -v PriorDiag_sd.nc           input_sd.${OCEAN_TIME}.nc
-\mv -v PriorDiag_inf_mean.nc     preassim_mean.${OCEAN_TIME}.nc
-\mv -v PriorDiag_inf_sd.nc       preassim_sd.${OCEAN_TIME}.nc
-\mv -v PosteriorDiag_inf_mean.nc postassim_mean.${OCEAN_TIME}.nc
-\mv -v PosteriorDiag_inf_sd.nc   postassim_sd.${OCEAN_TIME}.nc
-\mv -v mean.nc                   output_mean.${OCEAN_TIME}.nc
-\mv -v sd.nc                     output_sd.${OCEAN_TIME}.nc
+foreach FILE ( input_*mean.nc input_*sd.nc \
+               preassim_*mean.nc preassim_*sd.nc \
+               preassim_member_????.nc \
+               postassim_*mean.nc postassim_*sd.nc \
+               postassim_member_????.nc \
+               output_*mean.nc output_*sd.nc )
 
-# Tag the inflation files with the valid time of the model state.
+   if (  -e $FILE ) then
+      set FEXT  = $FILE:e
+      set FBASE = $FILE:r
+      \mv -v $FILE ${FBASE}.${OCEAN_TIME}.${FEXT}
+   else
+      echo "$FILE does not exist, no need to take action."
+   endif
 
-\mv -v output_priorinf_mean.nc   output_priorinf_mean.${OCEAN_TIME}.nc
-\mv -v output_priorinf_sd.nc     output_priorinf_sd.${OCEAN_TIME}.nc
-\mv -v output_postinf_mean.nc    output_postinf_mean.${OCEAN_TIME}.nc
-\mv -v output_postinf_sd.nc      output_postinf_sd.${OCEAN_TIME}.nc
+end
 
 # Tag the observation file with the valid time of the model state.
 

Modified: DART/branches/rma_fixed_filenames/models/ROMS/work/input.nml
===================================================================
--- DART/branches/rma_fixed_filenames/models/ROMS/work/input.nml	2017-01-13 22:05:05 UTC (rev 10887)
+++ DART/branches/rma_fixed_filenames/models/ROMS/work/input.nml	2017-01-13 22:06:15 UTC (rev 10888)
@@ -26,8 +26,6 @@
    async                    = 0
    adv_ens_command          = "./DART_trying_to_advance_ROMS_not_supported.csh"
    ens_size                 = 3
-   input_restart_file_list  = "restarts_in.txt"
-   output_restart_file_list = "restarts_out.txt"
    obs_sequence_in_name     = "obs_seq.out"
    obs_sequence_out_name    = "obs_seq.final"
    init_time_days           = -1
@@ -38,26 +36,26 @@
    last_obs_seconds         = -1
    obs_window_days          = 2
    obs_window_seconds       = 0