ESCOMP · slevis-lmwg · Jul 30, 2025 · Aug 11, 2025 · Aug 12, 2025 · Aug 13, 2025
diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm
@@ -1706,10 +1706,10 @@ sub process_namelist_inline_logic {
   }
   setup_logic_cnmatrix($opts,  $nl_flags, $definition, $defaults, $nl, $envxml_ref);
   setup_logic_spinup($opts,  $nl_flags, $definition, $defaults, $nl);
-  setup_logic_supplemental_nitrogen($opts, $nl_flags, $definition, $defaults, $nl);
   setup_logic_c_isotope($opts, $nl_flags, $definition, $defaults, $nl);
   setup_logic_snowpack($opts,  $nl_flags, $definition, $defaults, $nl);
   setup_logic_fates($opts,  $nl_flags, $definition, $defaults, $nl);
+  setup_logic_supplemental_nitrogen($opts, $nl_flags, $definition, $defaults, $nl);
   setup_logic_z0param($opts, $nl_flags, $definition, $defaults, $nl);
   setup_logic_misc($opts, $nl_flags, $definition, $defaults, $nl);
 
@@ -3325,12 +3325,12 @@ sub setup_logic_supplemental_nitrogen {
   if ( $nl_flags->{'bgc_mode'} ne "sp" && $nl_flags->{'bgc_mode'} ne "fates" && &value_is_true($nl_flags->{'use_crop'}) ) {
       # If this is non-fates, non-sp and crop is active
       add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl,
-		  'suplnitro', 'use_cn'=>$nl_flags->{'use_cn'}, 'use_crop'=>$nl_flags->{'use_crop'});
+                 'suplnitro', 'use_cn'=>$nl_flags->{'use_cn'}, 'use_crop'=>$nl_flags->{'use_crop'});
 
   } elsif ( $nl_flags->{'bgc_mode'} eq "fates" && not &value_is_true( $nl_flags->{'use_fates_sp'})  ) {
       # Or... if its fates but not fates-sp
       add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl,
-		  'suplnitro', 'use_fates'=>$nl_flags->{'use_fates'});
+                 'suplnitro', 'fates_parteh_mode'=>remove_leading_and_trailing_quotes($nl->get_value('fates_parteh_mode')));
   }
   #
   # Error checking for suplnitro
@@ -3349,6 +3349,18 @@ sub setup_logic_supplemental_nitrogen {
         $log->warning("There is no need to use a bgc_spinup mode when supplemental Nitrogen is on for all PFT's, as these modes spinup Nitrogen" );
       }
     }
+
+    my $parteh_mode = $nl->get_value('fates_parteh_mode');
+    if ( ($parteh_mode =~ /carbon_only/i) && ($suplnitro !~ /ALL/i) ) {
+      $log->fatal_error("supplemental Nitrogen (suplnitro) is NOT set to ALL, FATES is on, " .
+                        "and fates_parteh_mode = $parteh_mode, so Nitrogen is not active; " .
+                        "change suplnitro back to ALL");
+    }
+    if ( ($parteh_mode =~ /carbon_nitrogen/i) && &value_is_true( $nl_flags->{'use_fates_sp'}) ) {
+      $log->fatal_error("FATES is on, " .
+                        "FATES-SP is active, but fates_parteh_mode = $parteh_mode, so Nitrogen is active; " .
+                        "change fates_parteh_mode to carbon_only or do not use FATES-SP");
+    }
   }
 }
 
@@ -4926,14 +4938,6 @@ sub setup_logic_fates {
                     'use_fates_managed_fire'=>$nl->get_value('use_fates_managed_fire'),
                     'use_fates_sp'=>$nl_flags->{'use_fates_sp'} );
 
-        my $suplnitro = $nl->get_value('suplnitro');
-        my $parteh_mode = $nl->get_value('fates_parteh_mode');
-        if ( ($parteh_mode == 1) &&  ($suplnitro !~ /ALL/) && not &value_is_true( $nl_flags->{'use_fates_sp'}) ) {
-          $log->fatal_error("supplemental Nitrogen (suplnitro) is NOT set to ALL, FATES is on, " .
-                            "but and FATES-SP is not active, but fates_parteh_mode is 1, so Nitrogen is not active" .
-                            "Change suplnitro back to ALL");
-        }
-
         # For FATES SP mode make sure no-competetiion, and fixed-biogeography are also set
         # And also check for other settings that can't be trigged on as well
         #

diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
@@ -220,10 +220,6 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <megan_use_gamma_sm>.false.</megan_use_gamma_sm>
 <megan_min_gamma_sm>0.0d00</megan_min_gamma_sm>
 
-<!-- Supplmental Nitrogen mode -->
-<suplnitro use_cn=".true." >NONE</suplnitro>
-<suplnitro use_fates=".true." >ALL</suplnitro>
-
 <!-- Albedo for glaciers -->
 <albice               >0.50,0.30</albice>
 <albice phys="clm4_5" >0.60,0.40</albice>
@@ -2679,7 +2675,7 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.4.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
 <use_fates_luh                  use_fates=".true." use_fates_lupft=".true.">.true.</use_fates_luh>
 <use_fates_luh                  use_fates=".true." use_fates_potentialveg=".true.">.true.</use_fates_luh>
 <use_fates_luh                  use_fates=".true."                                >.false.</use_fates_luh>
-<fates_parteh_mode              use_fates=".true.">1</fates_parteh_mode>
+<fates_parteh_mode              use_fates=".true.">carbon_only</fates_parteh_mode>
 <fates_seeddisp_cadence         use_fates=".true.">0</fates_seeddisp_cadence>
 <use_fates_nocomp               use_fates=".true." use_fates_sp=".true."   >.true.</use_fates_nocomp>
 <use_fates_nocomp               use_fates=".true." use_fates_lupft=".true.">.true.</use_fates_nocomp>
@@ -2689,6 +2685,9 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.4.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
 <use_fates_fixed_biogeog        use_fates=".true."                         >.false.</use_fates_fixed_biogeog>
 <fates_history_dimlevel         use_fates=".true.">2,2</fates_history_dimlevel>
 
+<!-- Supplmental Nitrogen mode -->
+<suplnitro >NONE</suplnitro>
+<suplnitro fates_parteh_mode="carbon_only" >ALL</suplnitro>
 
 <!-- =========================================  -->
 <!-- Defaults for dynamic subgrid               -->

diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml
@@ -713,8 +713,8 @@ Toggle to turn on the FATES model
 Functionally Assembled Terrestrial Ecosystem Simulator (FATES)
 </entry>
 
-<entry id="fates_parteh_mode" type="integer" category="physics"
-        group="clm_inparm" valid_values="1,2">
+<entry id="fates_parteh_mode" type="char*256" category="physics"
+       group="clm_inparm" valid_values="carbon_only,carbon_nitrogen">
 Switch deciding which nutrient model to use in FATES.
 (Only relevant if FATES is on)
 </entry>

diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
@@ -3849,7 +3849,27 @@
     </machines>
     <options>
       <option name="wallclock">00:40:00</option>
-      <option name="comment">Exact restart debug test covering Fates CNP nutrients mode.</option>
+      <option name="comment">Exact restart debug test covering Fates CNP nutrients mode (P still prescribed in clm).</option>
+    </options>
+  </test>
+  <test name="ERS_D_Ld30" grid="f45_f45_mg37" compset="I2000Clm60FatesCruRsGs" testmods="clm/FatesColdPRT2_suplnAll">
+    <machines>
+      <machine name="derecho" compiler="intel" category="fates"/>
+      <machine name="lawrencium-lr3" compiler="intel" category="fates"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:40:00</option>
+      <option name="comment">Exact restart debug test covering Fates CNP nutrients mode with suplnitro set to ALL.</option>
+    </options>
+  </test>
+  <test name="ERS_D_Ld30" grid="f45_f45_mg37" compset="I2000Clm60FatesCruRsGs" testmods="clm/FatesColdPRT2_synthN">
+    <machines>
+      <machine name="derecho" compiler="intel" category="fates"/>
+      <machine name="lawrencium-lr3" compiler="intel" category="fates"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:40:00</option>
+      <option name="comment">Exact restart debug test covering Fates CNP nutrients mode with both P and N prescribed to replicate what happened before the CLM-FATES-CN coupling.</option>
     </options>
   </test>
   <test name="ERS_D_Ld30" grid="f45_f45_mg37" compset="HIST_DATM%CRUv7_CLM50%FATES_SICE_SOCN_SROF_SGLC_SWAV_SESP" testmods="clm/FatesColdLandUse">

diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdLUH2/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdLUH2/user_nl_clm
@@ -27,7 +27,7 @@ hist_fincl1       = 'FATES_NCOHORTS', 'FATES_TRIMMING', 'FATES_AREA_PLANTS',
 'FATES_DEMOTION_CARBONFLUX', 'FATES_PROMOTION_CARBONFLUX',
 'FATES_MORTALITY_CFLUX_CANOPY', 'FATES_MORTALITY_CFLUX_USTORY',
 'FATES_NEP', 'FATES_HET_RESP', 'FATES_FIRE_CLOSS', 'FATES_FIRE_FLUX_EL',
-'FATES_CBALANCE_ERROR', 'FATES_ERROR_EL', 'FATES_LEAF_ALLOC',
+'FATES_CBALANCE_ERROR', 'FATES_LEAF_ALLOC',
 'FATES_SEED_ALLOC', 'FATES_STEM_ALLOC', 'FATES_FROOT_ALLOC',
 'FATES_CROOT_ALLOC', 'FATES_STORE_ALLOC',
 'FATES_PATCHAREA_LU', 'FATES_DISTURBANCE_RATE_MATRIX_LULU',

diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/shell_commands
@@ -1,13 +1,10 @@
 SRCDIR=`./xmlquery SRCROOT --value`
 CASEDIR=`./xmlquery CASEROOT --value`
 FATESDIR=$SRCDIR/src/fates/
-
-FATESPARAMFILE=$CASEDIR/fates_params_prt2_prescribed_np.json
+FATESPARAMFILE=$CASEDIR/fates_params_prt2_prescribed_p.json
 
 cp $FATESDIR/parameter_files/fates_params_default.json $FATESPARAMFILE
 
-$FATESDIR/tools/modify_fates_paramfile.py --overwrite --fin $FATESPARAMFILE --param fates_cnp_prescribed_nuptake --values 1.0 --indices all
-
-$FATESDIR/tools/modify_fates_paramfile.py --overwrite --fin $FATESPARAMFILE --param fates_cnp_prescribed_puptake --values 1.0 --indices all
+$FATESDIR/tools/modify_fates_paramfile.py --overwrite --fin $FATESPARAMFILE --param fates_cnp_prescribed_puptake --values 10.0 --indices all
 
-echo "fates_paramfile = '$FATESPARAMFILE'" >> $CASEDIR/user_nl_clm
+echo "fates_paramfile = '$FATESPARAMFILE'" >> $CASEDIR/user_nl_clm
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/user_nl_clm
@@ -1,4 +1,4 @@
-fates_parteh_mode = 2
+fates_parteh_mode = 'carbon_nitrogen'
 hist_fincl1       = 'FATES_L2FR','FATES_L2FR_CANOPY_REC_PF','FATES_L2FR_USTORY_REC_PF',
 'FATES_NH4UPTAKE_SZPF','FATES_NO3UPTAKE_SZPF','FATES_NEFFLUX_SZPF',
 'FATES_NDEMAND_SZPF','FATES_NFIX_SYM_SZPF','FATES_NH4UPTAKE','FATES_NO3UPTAKE',

diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_suplnAll/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_suplnAll/include_user_mods
@@ -0,0 +1,3 @@
+../nofireemis
+../cn_conly
+../FatesColdPRT2
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_synthN/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_synthN/include_user_mods
@@ -0,0 +1,3 @@
+../Fates
+../FatesCold
+../FatesSetupParamBuild/
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_synthN/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_synthN/shell_commands
@@ -0,0 +1,11 @@
+SRCDIR=`./xmlquery SRCROOT --value`
+CASEDIR=`./xmlquery CASEROOT --value`
+FATESDIR=$SRCDIR/src/fates/
+FATESPARAMFILE=$CASEDIR/fates_params_prt2_prescribed_np.json
+
+cp $FATESDIR/parameter_files/fates_params_default.json $FATESPARAMFILE
+
+$FATESDIR/tools/modify_fates_paramfile.py --overwrite --fin $FATESPARAMFILE --param fates_cnp_prescribed_puptake --values 10.0 --indices all
+$FATESDIR/tools/modify_fates_paramfile.py --overwrite --fin $FATESPARAMFILE --param fates_cnp_prescribed_nuptake --values 10.0 --indices all
+
+echo "fates_paramfile = '$FATESPARAMFILE'" >> $CASEDIR/user_nl_clm
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_synthN/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_synthN/user_nl_clm
@@ -0,0 +1,12 @@
+fates_parteh_mode = 'carbon_nitrogen'
+hist_fincl1       = 'FATES_L2FR','FATES_L2FR_CANOPY_REC_PF','FATES_L2FR_USTORY_REC_PF',
+'FATES_NH4UPTAKE_SZPF','FATES_NO3UPTAKE_SZPF','FATES_NEFFLUX_SZPF',
+'FATES_NDEMAND_SZPF','FATES_NFIX_SYM_SZPF','FATES_NH4UPTAKE','FATES_NO3UPTAKE',
+'FATES_NEFFLUX','FATES_NDEMAND','FATES_NFIX_SYM','FATES_STOREN','FATES_STOREN_TF',
+'FATES_VEGN','FATES_SAPWOODN','FATES_LEAFN','FATES_FROOTN','FATES_REPRON','FATES_VEGN_SZPF',
+'FATES_LEAFN_SZPF','FATES_FROOTN_SZPF','FATES_SAPWOODN_SZPF','FATES_STOREN_SZPF','FATES_STOREN_TF_CANOPY_SZPF',
+'FATES_STOREN_TF_USTORY_SZPF','FATES_REPRON_SZPF','FATES_STOREP','FATES_STOREP_TF','FATES_VEGP','FATES_SAPWOODP',
+'FATES_LEAFP','FATES_FROOTP','FATES_REPROP','FATES_PUPTAKE','FATES_PEFFLUX','FATES_PDEMAND',
+'FATES_VEGP_SZPF','FATES_LEAFP_SZPF','FATES_FROOTP_SZPF','FATES_SAPWOODP_SZPF','FATES_STOREP_SZPF',
+'FATES_STOREP_TF_CANOPY_SZPF','FATES_STOREP_TF_USTORY_SZPF','FATES_REPROP_SZPF','FATES_PUPTAKE_SZPF',
+'FATES_PEFFLUX_SZPF','FATES_PDEMAND_SZPF'
diff --git a/src/biogeochem/CNDriverMod.F90 b/src/biogeochem/CNDriverMod.F90
@@ -479,7 +479,7 @@ subroutine CNDriverNoLeaching(bounds,
                                      cnveg_carbonflux_inst,cnveg_nitrogenstate_inst,cnveg_nitrogenflux_inst,   &
                                      soilbiogeochem_carbonflux_inst,&
                                      soilbiogeochem_state_inst,soilbiogeochem_nitrogenstate_inst,              &
-                                     soilbiogeochem_nitrogenflux_inst,canopystate_inst)
+                                     soilbiogeochem_nitrogenflux_inst,canopystate_inst, clm_fates)
      call t_stopf('soilbiogeochemcompetition')
 
     ! distribute the available N between the competing patches  on the basis of 

diff --git a/src/biogeochem/CNNDynamicsMod.F90 b/src/biogeochem/CNNDynamicsMod.F90
@@ -239,17 +239,14 @@ subroutine CNNFixation(num_soilc, filter_soilc, &
             if(col%is_fates(c))then
                s = clm_fates%f2hmap(clump_index)%hsites(c)
                ! %ema_npp is Smoothed [gc/m2/yr]
-               !npp = clm_fates%fates(clump_index)%bc_out(s)%ema_npp/(dayspyr*secspday)
-               ! FATES N cycling is not yet active, so runs are supplemented anyway
-               ! this will be added when FATES N cycling is completed.
-               npp = 0._r8
+               npp = clm_fates%fates(clump_index)%bc_out(s)%ema_npp
             else
-               npp = col_lag_npp(c)
+               ! need to put npp in units of gC/m^2/year here first
+               npp = col_lag_npp(c) * secspday * dayspyr
             end if
 
             if (npp /= spval) then
-               ! need to put npp in units of gC/m^2/year here first
-               t = (1.8_r8 * (1._r8 - exp(-0.003_r8 * npp *(secspday * dayspyr))))/(secspday * dayspyr)  
+               t = (1.8_r8 * (1._r8 - exp(-0.003_r8 * npp))) / (secspday * dayspyr)
                nfix_to_sminn(c) = max(0._r8,t)
             else
                nfix_to_sminn(c) = 0._r8
@@ -262,14 +259,13 @@ subroutine CNNFixation(num_soilc, filter_soilc, &
 
             if(col%is_fates(c))then
                s = clm_fates%f2hmap(clump_index)%hsites(c)
-               !npp = clm_fates%fates(clump_index)%bc_out(s)%ema_npp 
-               ! See above regarding FATES and N fixation
-               npp = 0._r8
+               ! %ema_npp is Smoothed [gc/m2/yr]
+               npp = clm_fates%fates(clump_index)%bc_out(s)%ema_npp
             else 
                npp = cannsum_npp(c)
             end if
 
-            t = (1.8_r8 * (1._r8 - exp(-0.003_r8 * npp)))/(secspday * dayspyr)
+            t = (1.8_r8 * (1._r8 - exp(-0.003_r8 * npp))) / (secspday * dayspyr)
             nfix_to_sminn(c) = max(0._r8,t)
          end do
       endif

diff --git a/src/fates b/src/fates
diff --git a/src/main/clm_varctl.F90 b/src/main/clm_varctl.F90
@@ -324,9 +324,16 @@ module clm_varctl
 
   integer, public            :: fates_seeddisp_cadence = iundef         ! 0 => no seed dispersal
                                                                         ! 1, 2, 3 => daily, monthly, or yearly dispersal
-  integer, public            :: fates_parteh_mode = -9                  ! 1 => carbon only
-                                                                        ! 2 => C+N+P (not enabled yet)
-                                                                        ! no others enabled
+  character(len=256), public :: fates_parteh_mode = ''                  ! FATES Plant Allocation Reactions and Transport Hypotheses
+                                                                        ! = carbon_only : Cycle carbon in FATES only
+                                                                        ! = carbon_nitrogen: Cycle both carbon and nitrogen
+                                                                        ! in FATES. FATES will cycle phosphorus as well,
+                                                                        ! to do this, FATES will generate synthetic uptake
+                                                                        ! conditions to make sure that phosphorus is saturated
+                                                                        ! in the plant stores
+                                                                        ! so clm needs fates_cnp_prescribed_puptake > 1
+                                                                        ! (recommended value 10) in the fates paramfile
+
   integer, public            :: fates_spitfire_mode = 0                
                                                                         ! 0 for no fire; 1 for constant ignitions;
                                                                         ! > 1 for external data (lightning and/or anthropogenic ignitions)

diff --git a/src/main/clm_varpar.F90 b/src/main/clm_varpar.F90
@@ -53,8 +53,16 @@ module clm_varpar
   integer, public, parameter :: mxpft       =  78     ! maximum number of PFT's for any mode;
   integer, public, parameter :: mxsowings   =   1     ! maximum number of crop growing seasons to begin in any year;
   integer, public            :: mxharvests            ! maximum number of crop harvests in any year
-                                                      ! (allows for multiple harvests in a calendar year in case harvest occurs near
+                                                      ! (allows for multiple harvests in a calendar
+                                                      ! year in case harvest occurs near
                                                       ! beginning/end of year);
+
+  ! These strings define the clm-fates coupling, i.e. which chemical species
+  ! are cycled between the two, see corresponding values for fates_parteh_mode:
+  ! bld/namelist_files/namelist_definition_ctsm.xml
+  character(len=256), public, parameter :: clmfates_carbon_only = 'carbon_only'
+  character(len=256), public, parameter :: clmfates_carbon_nitrogen = 'carbon_nitrogen'
+
   ! FIX(RF,032414) might we set some of these automatically from reading pft-physiology?
   integer, public, parameter :: nlayer      =   3     ! number of VIC soil layer --Added by AWang
   integer, public    :: nlayert               ! number of VIC soil layer + 3 lower thermal layers
+2 −2		CMakeLists.txt
+60 −58		biogeochem/EDCanopyStructureMod.F90
+5 −5		biogeochem/EDCohortDynamicsMod.F90
+2 −2		biogeochem/EDMortalityFunctionsMod.F90
+7 −14		biogeochem/EDPatchDynamicsMod.F90
+7 −6		biogeochem/EDPhysiologyMod.F90
+2 −4		biogeochem/FatesAllometryMod.F90
+10 −6		biogeochem/FatesCohortMod.F90
+5 −5		biogeochem/FatesSoilBGCFluxMod.F90
+1 −2		biogeophys/CMakeLists.txt
+186 −77		biogeophys/FatesLeafBiophysParamsMod.F90
+7 −7		biogeophys/FatesPlantRespPhotosynthMod.F90
+1 −1		fire/SFFireWeatherMod.F90
+1 −1		fire/SFNesterovMod.F90
+325 −100		fire/SFParamsMod.F90
+12 −12		functional_unit_testing/parteh/f90src/FatesCohortWrapMod.F90
+1 −2		main/CMakeLists.txt
+1 −1		main/ChecksBalancesMod.F90
+3 −3		main/EDInitMod.F90
+44 −51		main/EDMainMod.F90
+546 −230		main/EDParamsMod.F90
+1,245 −485		main/EDPftvarcon.F90
+16 −9		main/EDTypesMod.F90
+1 −1		main/FatesGlobals.F90
+2 −3		main/FatesHistoryInterfaceMod.F90
+104 −127		main/FatesInterfaceMod.F90
+11 −22		main/FatesInventoryInitMod.F90
+487 −48		main/FatesParametersInterface.F90
+11 −39		main/FatesRestartInterfaceMod.F90
+138 −0		main/FatesSynchronizedParamsMod.F90
+12 −9		main/FatesUtilsMod.F90
+0 −1,272		main/JSONParameterUtilsMod.F90
+0 −54		parameter_files/TestParsing/TestJSON.F90
+0 −8		parameter_files/TestParsing/WrapJSonTestMod.F90
+0 −1		parameter_files/TestParsing/bld/README
+0 −26		parameter_files/TestParsing/build_testjson.sh
+2 −2		parameter_files/fates_params_default.cdl
+0 −2,190		parameter_files/fates_params_default.json
+0 −61		parameter_files/patch_default_bciopt224.json
+62 −0		parameter_files/patch_default_bciopt224.xml
+2 −2		parteh/PRTAllometricCNPMod.F90
+2 −2		parteh/PRTAllometricCarbonMod.F90
+2 −2		parteh/PRTGenericMod.F90
+1 −1		parteh/PRTParametersMod.F90
+817 −263		parteh/PRTParamsFATESMod.F90
+4 −5		testing/build_fortran_tests.py
+1 −1		testing/cime_setup.md
+6 −4		testing/functional_testing/allometry/FatesTestAllometry.F90
+6 −4		testing/functional_testing/fire/fuel/FatesTestFuel.F90
+6 −5		testing/functional_testing/fire/mortality/FatesTestFireMortality.F90
+1 −1		testing/functional_testing/fire/mortality/fire_mortality_test.py
+16 −105		testing/functional_testing/fire/ros/FatesTestROS.F90
+0 −39		testing/functional_testing/fire/ros/ros_test.py
+5 −3		testing/functional_testing/patch/FatesTestPatch.F90
+7 −7		testing/functional_tests.cfg
+0 −75		testing/generate_empty_test.py
+0 −34		testing/great_circle/TestGreatCircle.F90
+0 −45		testing/great_circle/WrapGreatCircleMod.F90
+0 −1		testing/great_circle/bld/README
+0 −27		testing/great_circle/build_gc.sh
+17 −14		testing/run_functional_tests.py
+0 −24		testing/templates/cmake_ftest_template.txt
+0 −6		testing/templates/cmake_utest_template.txt
+0 −33		testing/templates/fortran_test_template.txt
+0 −38		testing/templates/pfunit_template.txt
+0 −39		testing/templates/test_class_template.txt
+0 −434		testing/test_generator_class.py
+7 −7		testing/testing_shr/FatesFactoryMod.F90
+178 −35		testing/testing_shr/FatesUnitTestParamReaderMod.F90
+1 −1		testing/unit_tests.cfg
+0 −22		testing/utils.py
+297 −0		tools/FatesPFTIndexSwapper.py
+515 −0		tools/UpdateParamAPI.py
+0 −77		tools/batch_patch_params.py
+0 −483		tools/cdl_to_xml.py
+318 −329		tools/modify_fates_paramfile.py
+162 −0		tools/ncvarsort.py
+0 −102		tools/pft_index_swapper.py
+0 −157		tools/sort_parameters.py
+0 −71		tools/write_json.py