[Dart-dev] DART/branches Revision: 12917

[dart at ucar.edu]

thoar at ucar.edu
2018-10-26 10:56:27 -0600 (Fri, 26 Oct 2018)
120
Better post-run instructions.
Removed the SourceMod description because it is explained fully 
in the DART_params.csh 




Modified: DART/branches/cesm_clm/models/clm/shell_scripts/cesm2_0/CESM2_0_DART_config
===================================================================
--- DART/branches/cesm_clm/models/clm/shell_scripts/cesm2_0/CESM2_0_DART_config	2018-10-26 15:00:44 UTC (rev 12916)
+++ DART/branches/cesm_clm/models/clm/shell_scripts/cesm2_0/CESM2_0_DART_config	2018-10-26 16:56:27 UTC (rev 12917)
@@ -254,14 +254,9 @@
 4) If you stage your own inflation files, make sure you read the INFLATION section
    in ${CASEROOT}/CESM_DART_config
 
-5) Make sure the observation directory names in 
-   ${CASEROOT}/assimilate.csh and/or
-   ${CASEROOT}/perfect_model.csh 
-   match those on your system.
+5) Submit the CESM job in the normal way.
 
-6) Submit the CESM job in the normal way.
-
-7) You can use ${CASEROOT}/stage_cesm_files
+6) You can use ${CASEROOT}/stage_cesm_files
     to stage files to restart a run.
 
 -------------------------------------------------------------------------

Modified: DART/branches/cesm_clm/models/clm/shell_scripts/cesm2_0/CLM5_setup_assimilation
===================================================================
--- DART/branches/cesm_clm/models/clm/shell_scripts/cesm2_0/CLM5_setup_assimilation	2018-10-26 15:00:44 UTC (rev 12916)
+++ DART/branches/cesm_clm/models/clm/shell_scripts/cesm2_0/CLM5_setup_assimilation	2018-10-26 16:56:27 UTC (rev 12917)
@@ -30,8 +30,6 @@
 # job settings:
 #
 # run_queue, run_time, st_archive_queue, st_archive_time may be changed at any time
-#
-# ==============================================================================
 
 setenv run_queue regular
 setenv run_time 00:30:00
@@ -46,7 +44,6 @@
 # For list of the pre-defined component sets: ./create_newcase -list
 # To create a variant compset, see the CESM documentation and carefully
 # incorporate any needed changes into this script.
-# ==============================================================================
 
 # FATAL idea to make caseroot the same dir as where this setup script is
 # since the build process removes all files in the caseroot dir before
@@ -78,7 +75,6 @@
 # ==============================================================================
 # Preserve a copy of this script and the parameter file as it was run.
 # Copy the DART setup script (CESM_DART_config) to CASEROOT.
-# ==============================================================================
 
 set ThisFileName = $0:t
 ${COPY} $ThisFileName       ${caseroot}/${ThisFileName}.original
@@ -241,10 +237,6 @@
    set STREAMFILE_STATE3HR     = datm.streams.txt.CPLHISTForcing.State3hr_complete
 endif
 
-# I am not sure this has anything to do with our case, as we are using
-# our own forcing data ... required by changes to /glade in July 2018
-./xmlchange DIN_LOC_ROOT_CLMFORC=/glade/p/cgd/tss/CTSM_datm_forcing_data
-
 # ==============================================================================
 # Modify namelist templates for each instance.
 #
@@ -252,7 +244,6 @@
 # CLM builds its own 'finidat' value from the REFCASE variables.
 #
 # All of these must later on be staged with the expected filenames.
-# ==============================================================================
 
 @ inst = 1
 while ( $inst <= $num_instances )
@@ -472,30 +463,11 @@
 #===============================================================================
 # This example has SourceMods that enable CLM to output solar induced fluorescence
 # as a diagnostic variable in the history files as "FSIF".
-#
-# Copy modified CLM codes into SourceMods
-# src.clm
-# |-- clm4_0
-# |   |-- biogeochem
-# |   |   `-- CNBalanceCheckMod.F90
-# |   `-- biogeophys
-# |       |-- BalanceCheckMod.F90
-# |       |-- SnowHydrologyMod.F90
-# |       `-- UrbanMod.F90
-# `-- clm5_0
-#     |-- biogeochem
-#     |   `-- CNBalanceCheckMod.F90
-#     !-- biogeophys
-#     !   !-- CanopyFluxesMod.F90
-#     !   `-- PhotosynthesisMod.F90
-#     `-- cpl
-#         `-- lnd_import_export.F90
-# ==============================================================================
 
 if ( ${use_SourceMods} == TRUE ) then
 
-   if (    -d    ~/${cesmtag}/SourceMods ) then
-      ${COPY} -r ~/${cesmtag}/SourceMods/* ${caseroot}/SourceMods/ || exit 3
+   if (    -d    ${SourceModDir} ) then
+      ${COPY} -r ${SourceModDir}/* ${caseroot}/SourceMods/ || exit 3