fix variable names

Author: adrifoster

components/cdeps

@@ -24,8 +24,8 @@ module SatellitePhenologyMod
   private
   !
   ! !PUBLIC MEMBER FUNCTIONS:
-  public :: GetSatellitePhenologyInputs ! put the data into the correct format
-  public :: SetSatellitePhenologyBGCCanopyStructs ! CLM(BGC)-SP phenology and vegetation
+  public :: CalcSatellitePhenologyTimeInterp ! put the data into the correct format
+  public :: UpdateSatellitePhenologyCanopy ! CLM(BGC)-SP phenology and vegetation
   public :: SatellitePhenologyInit ! Dynamically allocate memory
   public :: interpMonthlyVeg       ! interpolate monthly vegetation data
   public :: readAnnualVegetation   ! Read in annual vegetation (needed for Dry-deposition)
@@ -89,7 +89,7 @@ subroutine SatellitePhenologyInit (bounds)
   end subroutine SatellitePhenologyInit
 
   !================================================================
-  subroutine GetSatellitePhenologyInputs(bounds, num_filter, filter, canopystate_inst)
+  subroutine CalcSatellitePhenologyTimeInterp(bounds, num_filter, filter, canopystate_inst)
     !
     ! !DESCRIPTION:
     ! Ecosystem dynamics: phenology, vegetation
@@ -155,11 +155,11 @@ subroutine GetSatellitePhenologyInputs(bounds, num_filter, filter, canopystate_i
       end do
       end associate
 
-   end subroutine GetSatellitePhenologyInputs
+   end subroutine CalcSatellitePhenologyTimeInterp
 
    !==============================================================================
 
-   subroutine SetSatellitePhenologyBGCCanopyStructs(bounds, num_filter, filter, &
+   subroutine UpdateSatellitePhenologyCanopy(bounds, num_filter, filter, &
     waterdiagnosticbulk_inst, canopystate_inst)
     !
     ! !DESCRIPTION:
@@ -186,8 +186,8 @@ subroutine SetSatellitePhenologyBGCCanopyStructs(bounds, num_filter, filter, &
     real(r8) :: ol                                ! thickness of canopy layer covered by snow (m)
     real(r8) :: fb                                ! fraction of canopy layer covered by snow
 
-    if (use_fates_sp) then 
-      write(iulog,*) 'SetSatellitePhenologyBGCCanopyStructs', 'should not be calling this method when use_fates_sp == .true.'
+    if (use_fates) then 
+      write(iulog,*) 'Should not be calling this method when use_fates == .true.'
      call endrun(msg=errMsg(sourcefile, __LINE__))
     end if 
 
@@ -251,7 +251,7 @@ subroutine SetSatellitePhenologyBGCCanopyStructs(bounds, num_filter, filter, &
 
     end associate
 
-  end subroutine SetSatellitePhenologyBGCCanopyStructs
+  end subroutine UpdateSatellitePhenologyCanopy
 
   !==============================================================================
   subroutine interpMonthlyVeg (bounds, canopystate_inst)

share

@@ -59,7 +59,7 @@ module clm_driver
   use UrbanRadiationMod      , only : UrbanRadiation
   !
   use SoilBiogeochemVerticalProfileMod   , only : SoilBiogeochemVerticalProfile
-  use SatellitePhenologyMod  , only : GetSatellitePhenologyInputs, interpMonthlyVeg, SetSatellitePhenologyBGCCanopyStructs
+  use SatellitePhenologyMod  , only : CalcSatellitePhenologyTimeInterp, interpMonthlyVeg, UpdateSatellitePhenologyCanopy
   use ndepStreamMod          , only : ndep_interp
   use cropcalStreamMod       , only : cropcal_advance, cropcal_interp
   use ch4Mod                 , only : ch4, ch4_init_gridcell_balance_check, ch4_init_column_balance_check
@@ -1045,9 +1045,9 @@ subroutine clm_drv(doalb, nextsw_cday, declinp1, declin, rstwr, nlend, rdate, ro
 
        if (((.not. use_cn) .and. (.not. use_fates) .and. (doalb))) then
           call t_startf('SatellitePhenology')
-          call GetSatellitePhenologyInputs(bounds_clump, filter(nc)%num_nolakep, filter(nc)%nolakep, &
+          call CalcSatellitePhenologyTimeInterp(bounds_clump, filter(nc)%num_nolakep, filter(nc)%nolakep, &
                canopystate_inst)
-          call SetSatellitePhenologyBGCCanopyStructs(bounds_clump, filter(nc)%num_nolakep, filter(nc)%nolakep, &
+          call UpdateSatellitePhenologyCanopy(bounds_clump, filter(nc)%num_nolakep, filter(nc)%nolakep, &
                water_inst%waterdiagnosticbulk_inst, canopystate_inst)
           call t_stopf('SatellitePhenology')
        end if
@@ -1060,7 +1060,7 @@ subroutine clm_drv(doalb, nextsw_cday, declinp1, declin, rstwr, nlend, rdate, ro
           ! E.g. in FATES, an active PFT vector of 1, 0, 0, 0, 1, 0, 1, 0 would be mapped into
           ! the host land model as 1, 1, 1, 0, 0, 0, 0.  As such, the 'active' filter would only
           ! use the first three points, which would incorrectly represent the interpolated values.
-          call GetSatellitePhenologyInputs(bounds_clump, &
+          call CalcSatellitePhenologyTimeInterp(bounds_clump, &
                filter_inactive_and_active(nc)%num_soilp, filter_inactive_and_active(nc)%soilp, &
                canopystate_inst)
           call t_stopf('SatellitePhenology')

src/biogeochem/SatellitePhenologyMod.F90

@@ -174,7 +174,7 @@ subroutine initialize2(ni,nj, currtime)
     use cropcalStreamMod              , only : cropcal_init, cropcal_interp, cropcal_advance
     use LakeCon                       , only : LakeConInit
     use SatellitePhenologyMod         , only : SatellitePhenologyInit, readAnnualVegetation, interpMonthlyVeg
-    use SatellitePhenologyMod         , only : GetSatellitePhenologyInputs
+    use SatellitePhenologyMod         , only : CalcSatellitePhenologyTimeInterp
     use SnowSnicarMod                 , only : SnowAge_init, SnowOptics_init
     use lnd2atmMod                    , only : lnd2atm_minimal
     use controlMod                    , only : NLFilename, check_missing_initdata_status
@@ -751,7 +751,7 @@ subroutine initialize2(ni,nj, currtime)
              ! E.g. in FATES, an active PFT vector of 1, 0, 0, 0, 1, 0, 1, 0 would be mapped into
              ! the host land model as 1, 1, 1, 0, 0, 0, 0.  As such, the 'active' filter would only
              ! use the first three points, which would incorrectly represent the interpolated values.
-             call GetSatellitePhenologyInputs(bounds_clump, &
+             call CalcSatellitePhenologyTimeInterp(bounds_clump, &
                   filter_inactive_and_active(nc)%num_soilp, filter_inactive_and_active(nc)%soilp, &
                   canopystate_inst)