(#560) - Add variable definition changes in coupled

Author: ccarouge

src/coupled/AM3/control/cable/CM3/cbl_canopy_type.F90

@@ -63,7 +63,6 @@ MODULE cable_canopy_type_mod
   REAL, ALLOCATABLE, PUBLIC :: fwet(:)              ! fraction of canopy wet
   REAL, ALLOCATABLE, PUBLIC :: fns_cor(:)           ! correction to net rad avail to soil (W/m2)
   REAL, ALLOCATABLE, PUBLIC :: ga_cor(:)            ! correction to ground heat flux (W/m2)    
-  REAL, ALLOCATABLE, PUBLIC :: evapfbl(:,:)         ! 
   REAL, ALLOCATABLE, PUBLIC :: gswx(:,:)            ! stom cond for water
   REAL, ALLOCATABLE, PUBLIC :: zetar(:,:)           ! stability parameter (ref height)
   REAL, ALLOCATABLE, PUBLIC :: zetash(:,:)          ! stability parameter (shear height)
@@ -144,7 +143,6 @@ MODULE cable_canopy_type_mod
   REAL, POINTER, PUBLIC :: fwet(:)              ! fraction of canopy wet
   REAL, POINTER, PUBLIC :: fns_cor(:)           ! correction to net rad avail to soil (W/m2)
   REAL, POINTER, PUBLIC :: ga_cor(:)            ! correction to ground heat flux (W/m2)    
-  REAL, POINTER, PUBLIC :: evapfbl(:,:)         ! 
   REAL, POINTER, PUBLIC :: gswx(:,:)            ! stom cond for water
   REAL, POINTER, PUBLIC :: zetar(:,:)           ! stability parameter (ref height)
   REAL, POINTER, PUBLIC :: zetash(:,:)          ! stability parameter (shear height)
@@ -230,7 +228,6 @@ SUBROUTINE alloc_canopy_type(var, mp)
 ALLOCATE( var% fwet(mp) )
 ALLOCATE( var% fns_cor(mp) )    !REV_CORR variable
 ALLOCATE( var% ga_cor(mp) )     !REV_CORR variable
-ALLOCATE( var % evapfbl(mp,nsl) )
 ALLOCATE( var% epot(mp) )
 ALLOCATE( var% fnpp(mp) )
 ALLOCATE( var% fevw_pot(mp) )
@@ -308,7 +305,6 @@ SUBROUTINE alloc_canopy_type(var, mp)
 var % fwet(:)        = 0.0      
 var % fns_cor(:)     = 0.0      
 var % ga_cor(:)      = 0.0      
-var % evapfbl(:,:)   = 0.0      
 var % gswx(:,:)      = 0.0      
 var % zetar(:,:)     = 0.0      
 var % zetash(:,:)    = 0.0      
@@ -382,7 +378,6 @@ SUBROUTINE dealloc_canopy_type(var)
    DEALLOCATE( var% fwet )
    DEALLOCATE( var% fns_cor )   !REV_CORR variable
    DEALLOCATE( var% ga_cor )    !REV_CORR variable
-   DEALLOCATE ( var % evapfbl )
    DEALLOCATE( var% epot )
    DEALLOCATE( var% fnpp )
    DEALLOCATE( var% fevw_pot )
@@ -473,7 +468,6 @@ SUBROUTINE assoc_canopy_type(canopy, canopy_data )
 canopy% fwet        => canopy_data% fwet
 canopy% fns_cor     => canopy_data% fns_cor
 canopy% ga_cor      => canopy_data% ga_cor
-canopy% evapfbl     => canopy_data% evapfbl
 canopy% gswx        => canopy_data% gswx
 canopy% zetar       => canopy_data% zetar
 canopy% zetash      => canopy_data% zetash
@@ -557,7 +551,6 @@ SUBROUTINE nullify_canopy_cbl( var )
    NULLIFY( var% fwet )
    NULLIFY( var% fns_cor )   !REV_CORR variable
    NULLIFY( var% ga_cor )    !REV_CORR variable
-   NULLIFY( var % evapfbl )
    NULLIFY( var% epot )
    NULLIFY( var% fnpp )
    NULLIFY( var% fevw_pot )

src/coupled/AM3/control/cable/CM3/ssnow_type.F90

@@ -74,11 +74,11 @@ MODULE cable_soil_snow_type_mod
   REAL, ALLOCATABLE :: tggsn        (:,:) ! snow temperature in K
   REAL, ALLOCATABLE :: dtmlt        (:,:) ! water flux to the soil
   REAL, ALLOCATABLE :: albsoilsn    (:,:) ! soil + snow reflectance
-  REAL, ALLOCATABLE :: evapfbl      (:,:) !
   REAL, ALLOCATABLE :: tilefrac     (:,:) ! factor for latent heat
 
   REAL(r_2), ALLOCATABLE :: wbtot      (:) ! total soil water (mm) 
 
+  REAL(r_2), ALLOCATABLE :: evapfbl     (:,:) !
   REAL(r_2), ALLOCATABLE :: gammzz      (:,:) ! heat capacity for each soil layer
   REAL(r_2), ALLOCATABLE :: wb          (:,:) ! volumetric soil moisture (solid+liq)
   REAL(r_2), ALLOCATABLE :: wbice       (:,:) ! soil ice 
@@ -209,11 +209,11 @@ MODULE cable_soil_snow_type_mod
   REAL, POINTER :: tggsn        (:,:) ! snow temperature in K
   REAL, POINTER :: dtmlt        (:,:) ! water flux to the soil
   REAL, POINTER :: albsoilsn    (:,:) ! soil + snow reflectance
-  REAL, POINTER :: evapfbl      (:,:) !
   REAL, POINTER :: tilefrac     (:,:) ! factor for latent heat
 
   REAL(r_2), POINTER :: wbtot      (:) ! total soil water (mm) 
 
+  REAL(r_2), POINTER :: evapfbl     (:,:) !
   REAL(r_2), POINTER :: gammzz      (:,:) ! heat capacity for each soil layer
   REAL(r_2), POINTER :: wb          (:,:) ! volumetric soil moisture (solid+liq)
   REAL(r_2), POINTER :: wbice       (:,:) ! soil ice 

src/coupled/shared/cable_canopy_type_mod.F90

@@ -62,7 +62,6 @@ MODULE cable_canopy_type_mod
        ga_cor  ! correction to ground heat flux (W/m2)
 
   REAL, DIMENSION(:,:), POINTER ::                                            &
-       evapfbl,                                                               &
        gswx,    & ! stom cond for water
        zetar, &   ! stability parameter (ref height)
                              ! vh_js !
@@ -158,7 +157,6 @@ SUBROUTINE alloc_canopy_type(var, mp)
 ALLOCATE( var% fwet(mp) )
 ALLOCATE( var% fns_cor(mp) )    !REV_CORR variable
 ALLOCATE( var% ga_cor(mp) )     !REV_CORR variable
-ALLOCATE ( var % evapfbl(mp,ms) )
 ALLOCATE( var% epot(mp) )
 ALLOCATE( var% fnpp(mp) )
 ALLOCATE( var% fevw_pot(mp) )

src/coupled/shared/cable_soilsnow_type_mod.F90

@@ -72,14 +72,14 @@ MODULE cable_soil_snow_type_mod
        tggsn,      & ! snow temperature in K
        dtmlt,      & ! water flux to the soil
        albsoilsn,  & ! soil + snow reflectance
-       evapfbl,    & !
        tilefrac      ! factor for latent heat
 
 
   REAL(r_2), DIMENSION(:), POINTER ::                                         &
        wbtot   ! total soil water (mm)
 
   REAL(r_2), DIMENSION(:,:), POINTER ::                                       &
+       evapfbl,    & !
        gammzz,  & ! heat capacity for each soil layer
        wb,      & ! volumetric soil moisture (solid+liq)
        wbice,   & ! soil ice