[Dart-dev] DART/branches Revision: 12109

[dart at ucar.edu]

thoar at ucar.edu
2017-11-16 10:39:36 -0700 (Thu, 16 Nov 2017)
93
Things I think are closer to being correct for CESM2 and the new DART layout/filenames/etc.




Modified: DART/branches/cesm_clm/models/CESM/shell_scripts/CESM_DART_config
===================================================================
--- DART/branches/cesm_clm/models/CESM/shell_scripts/CESM_DART_config	2017-11-16 17:32:44 UTC (rev 12108)
+++ DART/branches/cesm_clm/models/CESM/shell_scripts/CESM_DART_config	2017-11-16 17:39:36 UTC (rev 12109)
@@ -147,6 +147,8 @@
 
 ${COPY} ${DARTROOT}/models/CESM/shell_scripts/st_archive.sh           Tools/
 ${COPY} ${DARTROOT}/shell_scripts/shell_exit.sh                       .
+${COPY} ${DARTROOT}/assimilation_code/programs/gen_sampling_err_table/work/sampling_error_correction_table.nc \
+                                                                      ${RUNDIR}
 
 ${COPY} ${DARTROOT}/models/CESM/shell_scripts/assimilate.csh          .
 ${COPY} ${DARTROOT}/models/CESM/shell_scripts/cam_assimilate.csh      .
@@ -298,72 +300,6 @@
 
 ./update_dart_namelists || exit -9
 
-#=========================================================================
-# Stage the files needed for SAMPLING ERROR CORRECTION - even if not
-# initially requested. The file is static, small, and may be needed later.
-#
-# If it is requested and is not present ... it is an error.
-#
-# The sampling error correction is a lookup table.  Each ensemble size
-# has its own (static) file.  It is only needed if any
-# input.nml:&assim_tools_nml:sampling_error_correction = .true.,
-#
-# If any of the SECs in any namelist are true, force the final_full.nn
-# file to exist and be copied.  If they are all false, still try to copy
-# the file over to the cases dir so that if the user edits the namelist to
-# turn SEC on, the file will be there.  but in the latter case, don't fail
-# if the final_full doesn't exist for this ensemble size; just warn that
-# if it's turned on, they will have to generate one and copy it over.
-#=========================================================================
-
-if ( $num_instances > 1 ) then
-   foreach N ( cam_input.nml pop_input.nml clm_input.nml )
-      set  MYSTRING = `grep sampling_error_correction $N`
-      set  MYSTRING = `echo $MYSTRING | sed -e "s#[=,'\.]# #g"`
-      set  MYSTRING = `echo $MYSTRING | sed -e 's#"# #g'`
-      set SECSTRING = `echo $MYSTRING[2] | tr '[:upper:]' '[:lower:]'`
-   
-      if ( ${SECSTRING} == true ) then
-         set SAMP_ERR_FILE = ${DARTROOT}/system_simulation/final_full_precomputed_tables/final_full.${num_instances}
-         if (  -e   ${SAMP_ERR_FILE} ) then
-            ${COPY} ${SAMP_ERR_FILE} .
-            break   # we only need to copy it once if anyone has SEC on.
-         else
-            echo "ERROR: no sampling error correction file for this ensemble size."
-            echo "ERROR: looking for ${SAMP_ERR_FILE} in"
-            echo "ERROR: ${DARTROOT}/system_simulation/final_full_precomputed_tables"
-            echo "ERROR: one can be generated for any ensemble size; see docs."
-            exit -3
-         endif
-      endif
-   end
-   
-   # If the final_full file is not here, none of the namelists had SEC on,
-   # but go ahead and copy one here; it's not fatal if one doesn't already
-   # exist in the final_full_precomputed_tables dir for this ens size.
-   # If they want to turn it on later, it will be available.
-   
-   if ( ! -e ./final_full.${num_instances} ) then
-      set SAMP_ERR_FILE = ${DARTROOT}/system_simulation/final_full_precomputed_tables/final_full.${num_instances}
-      if (  -e   ${SAMP_ERR_FILE} ) then
-         ${COPY} ${SAMP_ERR_FILE} .
-      else
-         echo ""
-         echo "WARNING: no final_full.xx file found for an ensemble size of ${num_instances}."
-         echo "         This file is NOT needed unless you want to turn on the"
-         echo "         sampling_error_correction feature in any of the models."
-         echo "         To use it, in addition to setting the namelist to .true., cd to:"
-         echo "         ${DARTROOT}/system_simulation"
-         echo "         and create a final_full.${num_instances} file"
-         echo "         one can be generated for any ensemble size; see docs"
-         echo "         Copy it into ${CASEROOT} before running."
-         echo ""
-      endif
-   endif
-else
-   # sampling error correction not used for perfect_model_obs
-endif
-
 # ==============================================================================
 # INFLATION : Initial setup for the default inflation scenario.
 # ==============================================================================

Modified: DART/branches/cesm_clm/models/CESM/shell_scripts/cam_assimilate.csh
===================================================================
--- DART/branches/cesm_clm/models/CESM/shell_scripts/cam_assimilate.csh	2017-11-16 17:32:44 UTC (rev 12108)
+++ DART/branches/cesm_clm/models/CESM/shell_scripts/cam_assimilate.csh	2017-11-16 17:39:36 UTC (rev 12109)
@@ -153,34 +153,10 @@
 endif
 
 #=========================================================================
-# Block 2: Stage the files needed for SAMPLING ERROR CORRECTION
-#
-# The sampling error correction is a lookup table.
-# The tables were originally in the DART distribution, but should
-# have been staged to $CASEROOT at setup time.
-# Each ensemble size has its own (static) file.