Changeset 3245 for trunk/LMDZ.MARS/libf/phymars

Timestamp:

Feb 29, 2024, 3:45:42 PM (10 months ago)

Author:

llange

Message:

Mars PCM
Fixing bugs in soilwater (array size and indexes in loop)
LL

File:

• trunk/LMDZ.MARS/libf/phymars/soilwater.F90 (modified) (8 diffs)

trunk/LMDZ.MARS/libf/phymars/soilwater.F90

@@ -19 +19 @@
 ! suburface and the atmosphere.
 ! 
-! Water vapor and nsoiladsorbed water are treated as two separate subsurface tracers that are connected
+! Water vapor and adsorbed water are treated as two separate subsurface tracers that are connected
 ! by adsorption / desorption coefficients, including an adsorption / desorption kinetic factor.
 ! 
@@ -73 +73 @@
 logical, intent(in) :: exchange(ngrid)          ! logical :: array describing whether there is exchange with the atmosphere at the current timestep
 
-real, intent(in) :: qsat_surf(ngrid)           ! Saturation vapor pressure at the current surface temperature (formerly qsat)
+real, intent(in) :: qsat_surf(ngrid)            ! Saturation mixing ratio at the surface at the current surface temperature (formerly qsat)
 real, intent(in) :: pq(ngrid, nlayer, nq)       ! Tracer atmospheric mixing ratio
 real, intent(in) :: pa(ngrid, nlayer)           ! Coefficients za
@@ -79 +79 @@
 real, intent(in) :: pc(ngrid, nlayer)           ! Coefficients zc
 real, intent(in) :: pd(ngrid, nlayer)           ! Coefficients zd
-real, intent(in) :: pdqsdifpot(ngrid, nq)       ! Potential pdqsdif (without subsurface - atmosphere exchange)
+real, intent(in) :: pdqsdifpot(ngrid)           ! Potential pdqsdif (without subsurface - atmosphere exchange)
 
 real, intent(in) :: pplev(ngrid, nlayer+1)      ! Atmospheric pressure levels
@@ -87 +87 @@
 ! Variables modified :
 ! ----------------------------------------------------------------------
-real, intent(inout) :: pqsoil(ngrid, nsoil, 3*nq) ! Subsurface tracers (water vapor and ice) 
-real, intent(in) :: pqsurf(ngrid)                 ! Water ice on the surface
-                                                  ! (in kg.m - 3 : m - 3 of pore air for water vapor and m - 3 of regolith for water ice and adsorbed water)
+real, intent(inout) :: pqsoil(ngrid, nsoil, nqsoil) ! Subsurface tracers (water vapor and ice) 
+real, intent(in) :: pqsurf(ngrid)                   ! Water ice on the surface
+                                                    ! (in kg.m - 3 : m - 3 of pore air for water vapor and m - 3 of regolith for water ice and adsorbed water)
 ! Outputs :
 ! ---------------------------------------------------------------------- 
@@ -404 +404 @@
 !                              elseif (choice_ads.eq.2) then  ! par rapport \E0 valeur experimentale de reference
 !                                    !                                         Kd(ig, ik) = Kd_ref * exp(-enthalpy_ads / 8.314 *
-!                                    !     &                                         (1. / ptsoil(ig, nsoil - 4) - 1. / Tref))
+!                                    !     &           SSI_1D/ice_lat55_fb/                              (1. / ptsoil(ig, nsoil - 4) - 1. / Tref))
 !                                    !                                         Ka(ig, ik) = rho_soil(ig, ik) * Ka_ref *
 !                                    !     &                                         sqrt(ptsoil(ig, nsoil - 4) / Tref) / nref!
@@ -1079 +1079 @@
             if ( (.not.exchange(ig)) &
             .and. ( (-zdqsdifrego(ig) * ptimestep) &
-            .gt.( pqsurf(ig) + pdqsdifpot(ig, igcm_h2o_ice) * ptimestep) ) &
-            .and.( (pqsurf(ig) + pdqsdifpot(ig, igcm_h2o_ice) * ptimestep).gt.0. ) ) then
+            .gt.( pqsurf(ig) + pdqsdifpot(ig) * ptimestep) ) &
+            .and.( (pqsurf(ig) + pdqsdifpot(ig) * ptimestep).gt.0. ) ) then
 
                   ! calculate a new flux from the subsurface
-                  zdqsdifrego(ig) = -( pqsurf(ig) + pdqsdifpot(ig, igcm_h2o_ice) * ptimestep ) / ptimestep
+                  zdqsdifrego(ig) = -( pqsurf(ig) + pdqsdifpot(ig) * ptimestep ) / ptimestep
                   
 !                  ! check case where there is CO2 ice on the surface but qsurf = 0
@@ -1089 +1089 @@
 !                        zdqsdifrego(ig) = 0.D0  
 !                  endif
-
+                  do ik = 1, nsoil
 
                   ! calculate A and B coefficients ! modified 2020
@@ -1104 +1104 @@
                   
                   ! initialize all flags for the loop
-                  do ik = 1, nsoil
+                  
                         
                         ! initialize the ice