Bug fixes in NoahMP LSM and Noah LSM: rca is an optional argument

climbfuji · May 20, 2024 · 7e59eba · 7e59eba
1 parent e4d4f92
commit 7e59eba
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/physics/SFC_Models/Land/Noah/lsm_noah.f b/physics/SFC_Models/Land/Noah/lsm_noah.f
@@ -284,10 +284,9 @@ subroutine lsm_noah_run                                           &
 !  ---  output:
       real (kind=kind_phys), dimension(:), intent(inout) :: sncovr1,    &
      &       qsurf, gflux, drain, evap, hflx, ep, runoff, cmm, chh,     &
-     &       evbs, evcw, sbsno, snowc, stm, snohf, smcwlt2, smcref2,    &
-     &       rca
+     &       evbs, evcw, sbsno, snowc, stm, snohf, smcwlt2, smcref2
       real (kind=kind_phys), dimension(:), intent(inout), optional ::   &
-     &       wet1, lai
+     &       wet1, lai, rca
 
       character(len=*), intent(out) :: errmsg
       integer,          intent(out) :: errflg

diff --git a/physics/SFC_Models/Land/Noah/lsm_noah.meta b/physics/SFC_Models/Land/Noah/lsm_noah.meta
@@ -768,6 +768,7 @@
   type = real
   kind = kind_phys
   intent = inout
+  optional = True
 [errmsg]
   standard_name = ccpp_error_message
   long_name = error message for error handling in CCPP

diff --git a/physics/SFC_Models/Land/Noahmp/noahmpdrv.F90 b/physics/SFC_Models/Land/Noahmp/noahmpdrv.F90
@@ -400,7 +400,7 @@ subroutine noahmpdrv_run                                       &
   real(kind=kind_phys), dimension(:)     , intent(out), optional :: q2mp       ! combined q2m from tiles
   real(kind=kind_phys), dimension(:)     , intent(out)   :: zvfun      ! 
   real(kind=kind_phys), dimension(:)     , intent(out)   :: ztmax      ! thermal roughness length
-  real(kind=kind_phys), dimension(:)     , intent(out)   :: rca        ! total canopy/stomatal resistance (s/m)
+  real(kind=kind_phys), dimension(:)     , intent(out), optional :: rca        ! total canopy/stomatal resistance (s/m)
 
   character(len=*)    ,                    intent(out)   :: errmsg
   integer             ,                    intent(out)   :: errflg

diff --git a/physics/SFC_Models/Land/Noahmp/noahmpdrv.meta b/physics/SFC_Models/Land/Noahmp/noahmpdrv.meta
@@ -1410,6 +1410,7 @@
   type = real
   kind = kind_phys
   intent = out
+  optional = True
 [errmsg]
   standard_name = ccpp_error_message
   long_name = error message for error handling in CCPP