ESCOMP · samsrabin · Sep 19, 2023 · Aug 3, 2023 · Aug 3, 2023 · Aug 3, 2023
diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm
@@ -4386,7 +4386,7 @@ sub setup_logic_misc {
    add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'for_testing_use_second_grain_pool');
    add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'for_testing_use_repr_structure_pool');
    add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'for_testing_no_crop_seed_replenishment');
-   add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'hist_master_list_file');
+   add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'hist_fields_list_file');
 }
 
 #-------------------------------------------------------------------------------

diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
@@ -67,8 +67,8 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <for_testing_use_repr_structure_pool>.false.</for_testing_use_repr_structure_pool>
 <for_testing_no_crop_seed_replenishment>.false.</for_testing_no_crop_seed_replenishment>
 
-<!-- Set to .true. in namelist to write hist fields master list file -->
-<hist_master_list_file>.false.</hist_master_list_file>
+<!-- Set to .true. in namelist to write file with all history fields -->
+<hist_fields_list_file>.false.</hist_fields_list_file>
 
 <!-- In accelerated spinup mode reduce the amount of history output -->
 <hist_empty_htapes clm_accelerated_spinup="on">.true.</hist_empty_htapes>

diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml
@@ -764,9 +764,9 @@ SNICAR (SNow, ICe, and Aerosol Radiative model) optical data file name
 SNICAR (SNow, ICe, and Aerosol Radiative model) snow aging data file name
 </entry>
 
-<entry id="hist_master_list_file" type="logical" category="history"
+<entry id="hist_fields_list_file" type="logical" category="history"
        group="clm_inparm" valid_values="" value=".false.">
-If TRUE, write master field list to separate file for documentation purposes
+If TRUE, write list of all output fields to separate file for documentation purposes
 </entry>
 
 <entry id="hist_avgflag_pertape" type="char*10(10)" category="history"

diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
@@ -998,7 +998,7 @@
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
-      <option name="comment"  >Among other extra outputs, ensure that writing the history field master list to a separate file does not cause failure"</option>
+      <option name="comment"  >Among other extra outputs, ensure that writing the list of all history fields to a separate file does not cause failure"</option>
     </options>
   </test>
   <test name="ERS_D_Ld3" grid="f10_f10_mg37" compset="I1850Clm50BgcCrop" testmods="clm/default">

diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdCH4Off/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdCH4Off/user_nl_clm
@@ -1,2 +1,2 @@
 use_lch4 = .false.
-hist_master_list_file = .true.
+hist_fields_list_file = .true.
diff --git a/cime_config/testdefs/testmods_dirs/clm/SaveHistFieldList/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/SaveHistFieldList/user_nl_clm
@@ -0,0 +1 @@
+hist_fields_list_file = .true.
diff --git a/cime_config/testdefs/testmods_dirs/clm/extra_outputs/README b/cime_config/testdefs/testmods_dirs/clm/extra_outputs/README
@@ -1,4 +1,4 @@
 This test mod turns on extra diagnostic fields
 
-It also outputs an optional text file containing a table of the
-history fields master list
+It also outputs an optional text file containing a table of all
+the possible history fields
diff --git a/cime_config/testdefs/testmods_dirs/clm/extra_outputs/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/extra_outputs/user_nl_clm
@@ -1,5 +1,5 @@
 calc_human_stress_indices = 'ALL'
-hist_master_list_file = .true.
+hist_fields_list_file = .true.
 
 hist_fincl1   += 'GSSUN:L43200', 'GSSHA:L43200', 'FSDSND:L43200', 'FSRND:L43200', 'FSRSFND:L43200', 
                  'SSRE_FSRND:L43200', 'FSDSVD:L43200', 'FSDSVI:L43200',

diff --git a/doc/source/users_guide/setting-up-and-running-a-case/README_history_fields_files b/doc/source/users_guide/setting-up-and-running-a-case/README_history_fields_files
@@ -0,0 +1,11 @@
+2021/9/8 slevis
+2023/8/15 samsrabin
+
+The files history_fields_nofates.rst and history_fields_fates.rst each contain a
+table of the history fields, active and inactive, available in the CTSM cases
+that get generated by these tests:
+SMS_Ld1.f10_f10_mg37.I1850Clm50BgcCrop.cheyenne_intel.clm-SaveHistFieldList
+SMS_Ld1.f10_f10_mg37.I2000Clm50FatesCru.cheyenne_intel.clm-SaveHistFieldList
+
+To reproduce these .rst files, run the above tests and the files
+will appear in the corresponding run directories.
diff --git a/doc/source/users_guide/setting-up-and-running-a-case/README_master_list_files b/doc/source/users_guide/setting-up-and-running-a-case/README_master_list_files
diff --git a/...urce/users_guide/setting-up-and-running-a-case/customizing-the-clm-namelist.rst b/...urce/users_guide/setting-up-and-running-a-case/customizing-the-clm-namelist.rst
@@ -43,12 +43,12 @@ Included in the table are the following pieces of information:
 
 Table 1-3. CLM History Fields from a BgcCrop case
 -------------------------------------------------
-For Table from a BgcCrop case, please see :doc:`master_list_nofates`.
+For Table from a BgcCrop case, please see :doc:`history_fields_nofates`.
 
 
 Table 1-4. CLM History Fields from a Fates case
 -----------------------------------------------
-For Table from a Fates case, please see :doc:`master_list_fates`.
+For Table from a Fates case, please see :doc:`history_fields_fates`.
 
 
 ---------------------------------------------