From 5ba365e9b353f03acf7eadf25a3a88e6016ce984 Mon Sep 17 00:00:00 2001 From: Helin Wei Date: Wed, 14 Aug 2024 11:44:29 -0400 Subject: [PATCH] resolve merge conflict --- physics/SFC_Models/Land/Noahmp/noahmpdrv.F90 | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/physics/SFC_Models/Land/Noahmp/noahmpdrv.F90 b/physics/SFC_Models/Land/Noahmp/noahmpdrv.F90 index 67bd45a78..9332e6d79 100644 --- a/physics/SFC_Models/Land/Noahmp/noahmpdrv.F90 +++ b/physics/SFC_Models/Land/Noahmp/noahmpdrv.F90 @@ -1144,9 +1144,6 @@ subroutine noahmpdrv_run & chxy (i) = ch_noahmp zorl (i) = z0_total * 100.0 ! convert to cm ztmax (i) = z0h_total - - smois (i,:) = soil_moisture_vol - sh2o (i,:) = soil_liquid_vol !LAI-scale canopy resistance based on weighted sunlit shaded fraction if(rs_sunlit .le. 0.0 .or. rs_shaded .le. 0.0 .or. & @@ -1158,9 +1155,8 @@ subroutine noahmpdrv_run & rca(i) = max((1.0/rca(i)),parameters%rsmin) !resistance end if - smc (i,:) = soil_moisture_vol - slc (i,:) = soil_liquid_vol ->>>>>>> remotes/upstream/ufs/dev:physics/SFC_Models/Land/Noahmp/noahmpdrv.F90 + smois (i,:) = soil_moisture_vol + sh2o (i,:) = soil_liquid_vol snowxy (i) = float(snow_levels) weasd (i) = snow_water_equiv snicexy (i,:) = snow_level_ice