fixing typos and additional cleanup for fates landuse v2

E3SM-Project · Apr 23, 2024 · 8cc7ddc · 8cc7ddc
1 parent b33a722
commit 8cc7ddc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/components/elm/bld/namelist_files/namelist_definition.xml b/components/elm/bld/namelist_files/namelist_definition.xml
@@ -391,7 +391,7 @@ Full pathname to the inventory initialization control file.
 <entry id="use_fates_luh" type="logical" category="physics"
        group="elm_inparm" valid_values="" >
 If TRUE, enable use of land use state and transition data from luh_timeseries file.
-This is enabled by default in fates_harvest_mode is set to use the raw LUH2 harvest
+This is enabled by default if fates_harvest_mode is set to use the raw LUH2 harvest
 data (fates_harvest_mode >= 3)
 (Only valid for fates land use change runs, where there is a luh_timeseries file.)
 (Also, only valid for use_fates = true and is incompatible with transient runs currently.)

diff --git a/components/elm/src/dyn_subgrid/dynFATESLandUseChangeMod.F90 b/components/elm/src/dyn_subgrid/dynFATESLandUseChangeMod.F90
@@ -41,7 +41,7 @@ module dynFATESLandUseChangeMod
   integer, public, parameter    :: landuse_harvest_mass_units = 2
   integer, public               :: landuse_harvest_units
 
-  TYPE(dyn_file_type), target   :: dynFatesLandUse_file
+  type(dyn_file_type), target   :: dynFatesLandUse_file
 
   ! LUH2 raw wood harvest area fraction
   character(len=10), target :: landuse_harvest_area_varnames(num_landuse_harvest_vars) = &
@@ -153,8 +153,8 @@ subroutine dynFatesLandUseInit(bounds, landuse_filename)
     if (use_fates_luh) then
 
        ! Generate the dyn_file_type object
-       ! Start calls get_prev_date, where as end calls get_curr_date
-        dynFatesLandUse_file = dyn_file_type(landuse_filename, YEAR_POSITION_END_OF_TIMESTEP)
+       ! Start calls get_prev_date, whereas end calls get_curr_date
+       dynFatesLandUse_file = dyn_file_type(landuse_filename, YEAR_POSITION_END_OF_TIMESTEP)
 
        ! Get initial land use data from the fates luh2 timeseries dataset
        num_points = (bounds%endg - bounds%begg + 1)
@@ -254,7 +254,7 @@ subroutine dynFatesLandUseInterp(bounds, init_state)
        end if
        deallocate(this_data)
     end if
- 
+
   end subroutine dynFatesLandUseInterp
 
 

diff --git a/components/elm/src/main/controlMod.F90 b/components/elm/src/main/controlMod.F90
@@ -260,9 +260,9 @@ subroutine control_init( )
           use_fates_nocomp,                             &
           use_fates_sp,                                 &
           use_fates_luh,                                &
-          use_fates_potentialveg,                                &
+          use_fates_potentialveg,                       &
           fluh_timeseries,                              &
-          flandusepftdat,                                  &
+          flandusepftdat,                               &
           fates_parteh_mode,                            &
           fates_seeddisp_cadence,                       &
           use_fates_tree_damage

diff --git a/components/elm/src/main/elm_initializeMod.F90 b/components/elm/src/main/elm_initializeMod.F90
@@ -468,7 +468,7 @@ subroutine initialize2( )
     use elm_time_manager      , only : get_curr_date, get_nstep, advance_timestep
     use elm_time_manager      , only : timemgr_init, timemgr_restart_io, timemgr_restart
     use controlMod            , only : nlfilename
-    use controlMod            , only : fluh_timeseries, flandusepftdat
+    use controlMod            , only : fluh_timeseries
     use decompMod             , only : get_proc_clumps, get_proc_bounds, get_clump_bounds, bounds_type
     use domainMod             , only : ldomain
     use initInterpMod         , only : initInterp