update nfsc name

adrifoster · Oct 29, 2024 · 127fa7b · 127fa7b
1 parent ebf5f26
commit 127fa7b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/fates b/src/fates
diff --git a/src/main/histFileMod.F90 b/src/main/histFileMod.F90
@@ -28,7 +28,7 @@ module histFileMod
   use FatesInterfaceTypesMod , only : nlevheight
   use FatesInterfaceTypesMod , only : nlevdamage
   use FatesConstantsMod      , only : n_landuse_cats
-  use FatesFuelClassesMod    , only : nfsc
+  use FatesFuelClassesMod    , only : num_fuel_classes
   use FatesLitterMod         , only : ncwd
   use PRTGenericMod          , only : num_elements_fates  => num_elements
   use FatesInterfaceTypesMod , only : numpft_fates => numpft
@@ -2504,7 +2504,7 @@ subroutine htape_create (t, histrest)
        call ncd_defdim(lnfid, 'fates_levpft', numpft_fates, dimid)
        call ncd_defdim(lnfid, 'fates_levage', nlevage, dimid)
        call ncd_defdim(lnfid, 'fates_levheight', nlevheight, dimid)
-       call ncd_defdim(lnfid, 'fates_levfuel', nfsc, dimid)
+       call ncd_defdim(lnfid, 'fates_levfuel', num_fuel_classes, dimid)
        call ncd_defdim(lnfid, 'fates_levcwdsc', ncwd, dimid)
        call ncd_defdim(lnfid, 'fates_levscpf', nlevsclass*numpft_fates, dimid)
        call ncd_defdim(lnfid, 'fates_levcapf', nlevcoage*numpft_fates, dimid)
@@ -2519,7 +2519,7 @@ subroutine htape_create (t, histrest)
        call ncd_defdim(lnfid, 'fates_levelpft', num_elements_fates * numpft_fates, dimid)
        call ncd_defdim(lnfid, 'fates_levelcwd', num_elements_fates * ncwd, dimid)
        call ncd_defdim(lnfid, 'fates_levelage', num_elements_fates * nlevage, dimid)
-       call ncd_defdim(lnfid, 'fates_levagefuel', nlevage * nfsc, dimid)
+       call ncd_defdim(lnfid, 'fates_levagefuel', nlevage * num_fuel_classes, dimid)
        call ncd_defdim(lnfid, 'fates_levclscpf', nclmax*nlevsclass*numpft_fates, dimid)
        call ncd_defdim(lnfid, 'fates_levlanduse', n_landuse_cats, dimid)
        call ncd_defdim(lnfid, 'fates_levlulu', n_landuse_cats * n_landuse_cats, dimid)
@@ -5595,7 +5595,7 @@ subroutine hist_addfld2d (fname, type2d, units, avgflag, long_name, type1d_out,
     case ('fates_levheight')
        num2d = nlevheight
     case ('fates_levfuel')
-       num2d = nfsc
+       num2d = num_fuel_classes
     case ('fates_levcwdsc')
        num2d = ncwd
     case ('fates_levscpf')
@@ -5635,7 +5635,7 @@ subroutine hist_addfld2d (fname, type2d, units, avgflag, long_name, type1d_out,
     case ('fates_levelage')
        num2d = num_elements_fates*nlevage
     case ('fates_levagefuel')
-       num2d = nlevage*nfsc
+       num2d = nlevage*num_fuel_classes
     case('fates_levclscpf')
        num2d = nclmax * nclmax * numpft_fates
     case ('fates_levlanduse')

diff --git a/src/utils/clmfates_interfaceMod.F90 b/src/utils/clmfates_interfaceMod.F90
@@ -3622,7 +3622,7 @@ subroutine hlm_bounds_to_fates_bounds(hlm, fates)
    use FatesInterfaceTypesMod, only : nlevsclass, nlevage, nlevcoage
    use FatesInterfaceTypesMod, only : nlevheight
    use FatesInterfaceTypesMod, only : nlevdamage
-   use FatesFuelClassesMod,    only : nfsc
+   use FatesFuelClassesMod,    only : num_fuel_classes
    use FatesLitterMod,         only : ncwd
    use EDParamsMod,            only : nlevleaf, nclmax
    use FatesInterfaceTypesMod, only : numpft_fates => numpft
@@ -3674,7 +3674,7 @@ subroutine hlm_bounds_to_fates_bounds(hlm, fates)
    fates%sizeagepft_class_end   = nlevsclass * nlevage * numpft_fates
 
    fates%fuel_begin = 1
-   fates%fuel_end = nfsc
+   fates%fuel_end = num_fuel_classes
 
    fates%cwdsc_begin = 1
    fates%cwdsc_end = ncwd
@@ -3701,7 +3701,7 @@ subroutine hlm_bounds_to_fates_bounds(hlm, fates)
    fates%elage_end   = num_elements * nlevage
 
    fates%agefuel_begin = 1
-   fates%agefuel_end   = nlevage * nfsc
+   fates%agefuel_end   = nlevage * num_fuel_classes
 
    fates%cdpf_begin = 1
    fates%cdpf_end = nlevdamage * numpft_fates * nlevsclass
+14 −21		biogeochem/EDPatchDynamicsMod.F90
+3 −3		biogeochem/EDPhysiologyMod.F90
+0 −12		biogeochem/FatesLitterMod.F90
+57 −40		biogeochem/FatesPatchMod.F90
+2 −0		fire/CMakeLists.txt
+63 −0		fire/FatesFuelClassesMod.F90
+379 −0		fire/FatesFuelMod.F90
+2 −1		fire/SFFireWeatherMod.F90
+161 −295		fire/SFMainMod.F90
+3 −2		fire/SFNesterovMod.F90
+19 −24		fire/SFParamsMod.F90
+0 −9		main/EDInitMod.F90
+1 −1		main/EDTypesMod.F90
+12 −12		main/FatesHistoryInterfaceMod.F90
+6 −6		main/FatesInterfaceMod.F90
+6 −5		main/FatesRestartInterfaceMod.F90
+3 −1		testing/CMakeLists.txt
+4 −13		testing/functional_testing/allometry/FatesTestAllometry.F90
+1 −40		testing/functional_testing/allometry/allometry_plotting.py
+27 −0		testing/functional_testing/fire/CMakeLists.txt
+274 −0		testing/functional_testing/fire/FatesTestFireMod.F90
+123 −0		testing/functional_testing/fire/FatesTestFuel.F90
+410 −0		testing/functional_testing/fire/SyntheticFuelModels.F90
+96 −0		testing/functional_testing/fire/fuel_plotting.py
+19 −0		testing/run_fates_tests.py
+1 −0		testing/testing_shr/CMakeLists.txt
+36 −0		testing/testing_shr/FatesArgumentUtils.F90
+40 −1		testing/testing_shr/FatesUnitTestIOMod.F90
+6 −0		testing/unit_testing/fire_fuel_test/CMakeLists.txt
+100 −0		testing/unit_testing/fire_fuel_test/test_FireFuel.pf
+40 −0		testing/utils.py