fix issues

adrifoster · Sep 6, 2024 · 10241e7 · 10241e7
1 parent fff23bd
commit 10241e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm
@@ -28,4 +28,5 @@ hist_fincl1       = 'FATES_NCOHORTS', 'FATES_TRIMMING', 'FATES_AREA_PLANTS',
 'FATES_SEED_ALLOC', 'FATES_STEM_ALLOC', 'FATES_FROOT_ALLOC',
 'FATES_CROOT_ALLOC', 'FATES_STORE_ALLOC',
 'FATES_PATCHAREA_LU', 'FATES_DISTURBANCE_RATE_MATRIX_LULU'
-fates_paramfile = '/glade/work/afoster/CTSM/src/fates/parameter_files/fates_param_fuel.nc'
+
+! fates_paramfile = '/glade/work/afoster/CTSM/src/fates/parameter_files/fates_param_fuel.nc'
diff --git a/src/fates b/src/fates
+17 −16		biogeochem/EDPatchDynamicsMod.F90
+3 −3		biogeochem/EDPhysiologyMod.F90
+12 −0		biogeochem/FatesLitterMod.F90
+33 −51		biogeochem/FatesPatchMod.F90
+0 −2		fire/CMakeLists.txt
+0 −64		fire/FatesFuelClassesMod.F90
+0 −343		fire/FatesFuelMod.F90
+1 −2		fire/SFFireWeatherMod.F90
+276 −82		fire/SFMainMod.F90
+2 −3		fire/SFNesterovMod.F90
+15 −10		fire/SFParamsMod.F90
+9 −0		main/EDInitMod.F90
+1 −1		main/EDTypesMod.F90
+12 −12		main/FatesHistoryInterfaceMod.F90
+1 −1		main/FatesInterfaceMod.F90
+3 −4		main/FatesRestartInterfaceMod.F90
+9 −9		parameter_files/fates_params_default.cdl
+0 −1		testing/CMakeLists.txt
+13 −4		testing/functional_testing/allometry/FatesTestAllometry.F90
+40 −1		testing/functional_testing/allometry/allometry_plotting.py
+0 −27		testing/functional_testing/fire/CMakeLists.txt
+0 −274		testing/functional_testing/fire/FatesTestFireMod.F90
+0 −131		testing/functional_testing/fire/FatesTestFuel.F90
+0 −401		testing/functional_testing/fire/SyntheticFuelModels.F90
+0 −70		testing/functional_testing/fire/fuel_plotting.py
+0 −10		testing/run_fates_tests.py
+0 −1		testing/testing_shr/CMakeLists.txt
+0 −36		testing/testing_shr/FatesArgumentUtils.F90
+1 −40		testing/testing_shr/FatesUnitTestIOMod.F90
+0 −40		testing/utils.py