Changeset 3831

Timestamp:

Jul 4, 2025, 2:49:09 PM (18 hours ago)

Author:

jbclement

Message:

Mars PCM:
Imposing the prescribed atmospheric water profile though 'dq' instead of 'q' directly (more correct).
JBC

Location:

trunk/LMDZ.MARS

Files:

• changelog.txt (modified) (1 diff)
• libf/phymars/dyn1d/init_testphys1d_mod.F90 (modified) (2 diffs)
• libf/phymars/dyn1d/testphys1d.F90 (modified) (5 diffs)

trunk/LMDZ.MARS/changelog.txt

@@ -4892 +4892 @@
 == 02/07/2025 == JBC
 Small corrections to the "display_netcdf.py" script in the "util" folder.
+
+== 04/07/2025 == JBC
+Imposing the prescribed atmospheric water profile though 'dq' instead of 'q' directly (more correct).

trunk/LMDZ.MARS/libf/phymars/dyn1d/init_testphys1d_mod.F90

@@ -790 +790 @@
     if (prescribed_h2ovap) then
         write(*,*) 'Atmospheric water profile is prescribed'
-        write(*,*) 'Unless it reaches saturation (maximal value)'
         open(10,file = 'profile_prescribed_h2o_vap',status = 'old',form = 'formatted',action = 'read',iostat = ierr)
         if (ierr == 0) then
@@ -809 +808 @@
         else
             write(*,*) 'Atmospheric water profile is relaxed towards the profile in "profile_prescribed_h2o_vap"'
-            write(*,*) 'Unless it reaches saturation (maximal value)'
         endif
     else

trunk/LMDZ.MARS/libf/phymars/dyn1d/testphys1d.F90

@@ -6 +6 @@
 use phyredem,            only: physdem0, physdem1
 use watersat_mod,        only: watersat
-use tracer_mod,          only: igcm_h2o_vap, igcm_h2o_ice, noms
+use tracer_mod,          only: igcm_h2o_vap, noms
 use comcstfi_h,          only: pi, g, rcp, cpp
 use time_phylmdz_mod,    only: daysec
@@ -188 +188 @@
 
     ! Compute geopotential
-    ! ~~~~~~~~~~~~~~~~~~~~
+    ! --------------------
     s = (aps/psurf + bps)**rcp
     h = cpp*temp/(pks*s)
@@ -197 +197 @@
     enddo
 
-    ! Prescription of atmospheric water if asked
-    ! ------------------------------------------
-    if (water) then
-        call watersat(nlayer,temp,play,zqsat)
-        if (prescribed_h2ovap) then ! If atmospheric water profile is prescribed
-            if (h2ovap_relax_time < 0.) then ! Forcing
-                q(1,:,igcm_h2o_vap) = min(zqsat(:),q_prescribed_h2o_vap(:))
-            else ! Relaxation
-                q(1,:,igcm_h2o_vap) = q_prescribed_h2o_vap(:) + (q(1,:,igcm_h2o_vap) - q_prescribed_h2o_vap(:))*dexp(-dttestphys/h2ovap_relax_time)
-            endif
-        endif
-     endif
-
     ! Call physics
-    ! --------------------
+    ! ------------
     call physiq(1,llm,nq,firstcall,lastcall,day,time,dttestphys,plev,play,phi,u,v,temp,q,w,du,dv,dtemp,dq,dpsurf)
     !                                                                                      ^----- outputs -----^
 
     ! Wind increment: specific for 1D
-    ! --------------------------------
+    ! -------------------------------
     ! The physics compute the tendencies on u and v,
     ! here we just add Coriolos effect
@@ -238 +225 @@
     endif
 
-    ! Compute winds and temperature for next time step
-    ! ------------------------------------------------
+    ! Compute winds for next time step
+    ! --------------------------------
     u = u + dttestphys*du
     v = v + dttestphys*dv
+
+    ! Compute temperature for next time step
+    ! --------------------------------------
     temp = temp + dttestphys*dtemp
 
@@ -250 +240 @@
     play = aps + psurf*bps
 
-    ! Increment tracers
+    ! Prescription of atmospheric water if asked
+    ! ------------------------------------------
+    if (water .and. prescribed_h2ovap) then ! If atmospheric water profile is prescribed
+        if (h2ovap_relax_time < 0.) then ! Forcing
+            !call watersat(nlayer,temp,play,zqsat)
+            dq(1,:,igcm_h2o_vap) = (q_prescribed_h2o_vap(:) - q(1,:,igcm_h2o_vap))/dttestphys
+        else ! Relaxation
+            dq(1,:,igcm_h2o_vap) = (q_prescribed_h2o_vap(:) + (q(1,:,igcm_h2o_vap) - q_prescribed_h2o_vap(:))*dexp(-dttestphys/h2ovap_relax_time) - q(1,:,igcm_h2o_vap))/dttestphys
+        endif
+     endif
+
+    ! Compute tracers for next time step
+    ! ----------------------------------
     q = q + dttestphys*dq
 enddo ! End of time stepping loop (idt=1,ndt)