Merge pull request #364 from yuanhuas/master

A bug fix for FastPC.
CoLM-SYSU · Jan 11, 2025 · 7422873 · 7422873
2 parents 98103a1 + f059762
commit 7422873
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/main/MOD_Thermal.F90 b/main/MOD_Thermal.F90
@@ -276,7 +276,7 @@ SUBROUTINE THERMAL (ipatch ,patchtype,is_dry_lake,lb            ,deltim        ,
        t_soisno(lb:nl_soil),     &! soil temperature [K]
        wice_soisno(lb:nl_soil),  &! ice lens [kg/m2]
        wliq_soisno(lb:nl_soil)    ! liqui water [kg/m2]
-   
+
    real(r8), intent(in) :: &
        smp(1:nl_soil)         ,  &! soil matrix potential [mm]
        hk(1:nl_soil)              ! hydraulic conductivity [mm h2o/s]
@@ -896,6 +896,7 @@ SUBROUTINE THERMAL (ipatch ,patchtype,is_dry_lake,lb            ,deltim        ,
       etr_p   (ps:pe) = 0.
       hprl_p  (ps:pe) = 0.
       z0m_p   (ps:pe) = (1.-fsno)*zlnd + fsno*zsno
+      z0m             = sum( z0m_p (ps:pe)*pftfrac(ps:pe) )
 
       IF (DEF_USE_PLANTHYDRAULICS) THEN
          vegwp_p (:,ps:pe) = -2.5e4

diff --git a/mksrfdata/MOD_SingleSrfdata.F90 b/mksrfdata/MOD_SingleSrfdata.F90
@@ -75,7 +75,7 @@ MODULE MOD_SingleSrfdata
 #endif
    real(r8), allocatable :: SITE_soil_BA_alpha          (:)
    real(r8), allocatable :: SITE_soil_BA_beta           (:)
-   
+
    integer :: SITE_soil_texture
 
    real(r8) :: SITE_dbedrock = 0.
@@ -643,7 +643,7 @@ SUBROUTINE write_surface_data_single (numpatch, numpft)
       CALL ncio_write_serial (fsrfdata, 'soil_BA_beta ', SITE_soil_BA_beta , 'soil')
       CALL ncio_put_attr     (fsrfdata, 'soil_BA_alpha', 'source', source)
       CALL ncio_put_attr     (fsrfdata, 'soil_BA_beta ', 'source', source)
-      
+
       CALL ncio_write_serial (fsrfdata, 'soil_texture ', SITE_soil_texture)
       CALL ncio_put_attr     (fsrfdata, 'soil_texture ', 'source', source)
 
@@ -946,7 +946,7 @@ SUBROUTINE single_srfdata_final ()
 #endif
       IF (allocated(SITE_soil_BA_alpha         )) deallocate(SITE_soil_BA_alpha         )
       IF (allocated(SITE_soil_BA_beta          )) deallocate(SITE_soil_BA_beta          )
-      
+
       IF (allocated(SITE_sf_lut                )) deallocate(SITE_sf_lut                )
       IF (allocated(SITE_slp_type              )) deallocate(SITE_slp_type              )
       IF (allocated(SITE_asp_type              )) deallocate(SITE_asp_type              )