[Dart-dev] DART/branches Revision: 12916

[dart at ucar.edu]

thoar at ucar.edu
2018-10-26 09:00:44 -0600 (Fri, 26 Oct 2018)
101
Better specification of SourceMod handling,
ability to put output observations in a specific place.




Modified: DART/branches/cesm_clm/models/clm/shell_scripts/cesm2_0/CLM5_setup_pmo
===================================================================
--- DART/branches/cesm_clm/models/clm/shell_scripts/cesm2_0/CLM5_setup_pmo	2018-10-25 15:59:42 UTC (rev 12915)
+++ DART/branches/cesm_clm/models/clm/shell_scripts/cesm2_0/CLM5_setup_pmo	2018-10-26 15:00:44 UTC (rev 12916)
@@ -38,7 +38,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
@@ -68,7 +67,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
@@ -238,7 +236,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 )
@@ -466,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
 
       set clm_opts = `echo $CLM_CONFIG_OPTS | sed -e "s/-//"`
 
@@ -523,8 +501,9 @@
          @ iarg = $iarg + 2
       end
    else
-      echo "MESSAGE - No SourceMods for this case."
-      echo "MESSAGE - No SourceMods for this case."
+      echo "ERROR - DART_params.csh use_SourceMods = ${use_SourceMods}"
+      echo "ERROR - but there are no SourceMods in ${SourceModDir}"
+      exit 3
    endif
 endif
 

Modified: DART/branches/cesm_clm/models/clm/shell_scripts/cesm2_0/DART_params.csh
===================================================================
--- DART/branches/cesm_clm/models/clm/shell_scripts/cesm2_0/DART_params.csh	2018-10-25 15:59:42 UTC (rev 12915)
+++ DART/branches/cesm_clm/models/clm/shell_scripts/cesm2_0/DART_params.csh	2018-10-26 15:00:44 UTC (rev 12916)
@@ -41,9 +41,34 @@
    setenv CASE clm5_f09_SIF_e${num_instances}
 endif
 
+# ==============================================================================
 # There are SourceMods to enable CLM to compute SIF
+# SourceMods may be handled in one of two ways. If you have your own GIT clone of
+# the repository, you may simply commit your changes to your GIT repo and 
+# set use_SourceMods = FALSE . If you prefer to keep your changes separate 
+# (as was required under SVN), please put your SourceMods in a directory with 
+# the following structure (which is intended to be similar to the structure 
+# in the CLM distribution):
+#
+# ${SourceModDir}/src.clm
+#                |-- clm4_0
+#                |   |-- biogeochem
+#                |   |   `-- CNBalanceCheckMod.F90
+#                |   `-- biogeophys
+#                |       |-- BalanceCheckMod.F90
+#                |       |-- SnowHydrologyMod.F90
+#                |       `-- UrbanMod.F90
+#                `-- clm5_0
+#                    |-- biogeochem