[Dart-dev] DART/branches Revision: 11842

[dart at ucar.edu]

raeder at ucar.edu
2017-07-26 11:49:58 -0600 (Wed, 26 Jul 2017)
704
setup_advanced:
   Added check of the selected 1/4 degree, daily SST file.
      Does it have the "gregorian" calendar attribute?
   Added code to automatically specify the right LND_DOMAIN_FILE
      for 1 and 2 degree resolutions, when using hi-res SST files.
   Replaced user_nl_cam section which tried to specify aerosol, etc.
      forcing files with comments about rebuilding that section
      in the CESM2 context.
   Added check_finidat_year_consistency = .false. to user_nl_clm_####.
assimilate.csh; added another '-' to xmlquery commands to satisfy CESM2.
case_st_archive.py; added comment about the original file location.
config_archive.xml; added comment about the original file location.




Modified: DART/branches/rma_trunk/models/cam-fv/shell_scripts/cesm2_0_beta05/assimilate.csh
===================================================================
--- DART/branches/rma_trunk/models/cam-fv/shell_scripts/cesm2_0_beta05/assimilate.csh	2017-07-20 23:07:59 UTC (rev 11841)
+++ DART/branches/rma_trunk/models/cam-fv/shell_scripts/cesm2_0_beta05/assimilate.csh	2017-07-26 17:49:58 UTC (rev 11842)
@@ -34,13 +34,13 @@
 # In CESM1_4 xmlquery must be executed in $CASEROOT.
 cd ${CASEROOT}
 setenv CASE           $CASEROOT:t
-setenv ensemble_size  `./xmlquery NINST_ATM   -value`
-setenv CAM_DYCORE     `./xmlquery CAM_DYCORE  -value`
-setenv EXEROOT        `./xmlquery EXEROOT     -value`
-setenv RUNDIR         `./xmlquery RUNDIR      -value`
-setenv archive        `./xmlquery DOUT_S_ROOT -value`
-setenv TOTALPES       `./xmlquery TOTALPES    -value`
-setenv DATA_ASSIMILATION_CYCLES        `./xmlquery DATA_ASSIMILATION_CYCLES -value`
+setenv ensemble_size  `./xmlquery NINST_ATM   --value`
+setenv CAM_DYCORE     `./xmlquery CAM_DYCORE  --value`
+setenv EXEROOT        `./xmlquery EXEROOT     --value`
+setenv RUNDIR         `./xmlquery RUNDIR      --value`
+setenv archive        `./xmlquery DOUT_S_ROOT --value`
+setenv TOTALPES       `./xmlquery TOTALPES    --value`
+setenv DATA_ASSIMILATION_CYCLES        `./xmlquery DATA_ASSIMILATION_CYCLES --value`
 cd $RUNDIR
 
 setenv save_all_inf TRUE

Modified: DART/branches/rma_trunk/models/cam-fv/shell_scripts/cesm2_0_beta05/case_st_archive.py
===================================================================
--- DART/branches/rma_trunk/models/cam-fv/shell_scripts/cesm2_0_beta05/case_st_archive.py	2017-07-20 23:07:59 UTC (rev 11841)
+++ DART/branches/rma_trunk/models/cam-fv/shell_scripts/cesm2_0_beta05/case_st_archive.py	2017-07-26 17:49:58 UTC (rev 11842)
@@ -1,5 +1,7 @@
 # This code may (or may not) be part of the CESM distribution,
 # So it is not protected by the DART copyright agreement. 
+# This file is a variation of 
+# cesm2_0_beta05/cime/utils/python/CIME/case_st_archive.py
 
 # DART $Id$
 

Modified: DART/branches/rma_trunk/models/cam-fv/shell_scripts/cesm2_0_beta05/config_archive.xml
===================================================================
--- DART/branches/rma_trunk/models/cam-fv/shell_scripts/cesm2_0_beta05/config_archive.xml	2017-07-20 23:07:59 UTC (rev 11841)
+++ DART/branches/rma_trunk/models/cam-fv/shell_scripts/cesm2_0_beta05/config_archive.xml	2017-07-26 17:49:58 UTC (rev 11842)
@@ -1,5 +1,7 @@
 <!-- This code may (or may not) be part of the CESM distribution,
      So it is not protected by the DART copyright agreement. 
+     It is a variation of 
+     cesm2_0_beta05/cime/cime_config/cesm/config_archive.xml
 
 ! DART $Id$
 -->
@@ -51,7 +53,7 @@
     <hist_file_extension>\.h.*.nc$</hist_file_extension>
     <rest_history_varname>unset</rest_history_varname>
     <rpointer>
-      <rpointer_file>rpointer.rof$NINST_STRING</rpointer_file> -->
+      <rpointer_file>rpointer.rof$NINST_STRING</rpointer_file> 
       <rpointer_content>$CASE.rtm.r.$DATENAME.nc</rpointer_content>
     </rpointer>
   </comp_archive_spec>

Modified: DART/branches/rma_trunk/models/cam-fv/shell_scripts/cesm2_0_beta05/setup_advanced
===================================================================
--- DART/branches/rma_trunk/models/cam-fv/shell_scripts/cesm2_0_beta05/setup_advanced	2017-07-20 23:07:59 UTC (rev 11841)
+++ DART/branches/rma_trunk/models/cam-fv/shell_scripts/cesm2_0_beta05/setup_advanced	2017-07-26 17:49:58 UTC (rev 11842)
@@ -210,7 +210,7 @@
 setenv rundir       /glade/scratch/${USER}/${case}/run
 setenv exeroot      /glade/scratch/${USER}/${case}/bld
 setenv archdir      /glade/scratch/${USER}/${case}/archive
-# >= CESM1_5; configure (called by cesm_setup?) has a new argument, cimeroot, 
+# CESM1_5(?); configure (called by cesm_setup?) has a new argument, cimeroot, 
 # which either needs to be provided on the command line 
 # or env var CIMEROOT needs to be defined.
 setenv CIMEROOT     $cesmroot/cime
@@ -241,7 +241,7 @@
 setenv refcase     CAM6_spinup_sst.25
 setenv refyear     2013
 setenv refmon      06
-setenv refday      01
+setenv refday      15
 setenv reftod      00000
 
 # useful combinations of time that we use below
@@ -292,6 +292,14 @@
 # Daily, 1/4-degree SSTs from Reynolds,...,Tomas
 setenv sst_dataset \
    "/glade/p/work/raeder/Models/CAM_init/SST/avhrr-only-v2.20130101_cat_20130731_filled_c170223.nc"
+#   "/glade/p/work/raeder/Models/CAM_init/SST/avhrr-only-v2.20130101_cat_20130731_filled_c170223.nc"
+set list = `ncdump -h $sst_dataset | grep calendar`
+if ($list[3] !~ '"gregorian"') then
+   echo "ERROR: $sst_dataset"
+   echo "       must have the calendar attribute attached to the time variable."
+   echo "       Use: ncatted -a calendar,time,c,c,gregorian $sst_dataset"
+   exit 5
+endif
 setenv sst_grid    /glade/p/work/raeder/Models/CAM_init/SST/domain.ocn.d025.120821.nc
 setenv sst_year_start $start_year
 setenv sst_year_end   $start_year
@@ -645,7 +653,7 @@
 #       BUT, do arrange it so that each member(instance) spans complete nodes:
 #       modulo(total pe count / number of instances, 15) == 0.