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

Timestamp:

Jul 31, 2025, 1:01:40 PM (3 months ago)

Author:

jbclement

Message:

Mars PCM:
Big corrections related to "simpleclouds" ("mircophys=.false.") because of r2984:

• getting "simpleclouds" calls out of the loop to save unnecessary iterations (spotted by Jonah M.). Running time is particularly improved!
• giving well-updated arguments to "simpleclouds" subroutine.
• bringing the old 'imicro' time subsampling back again for "simpleclouds" subroutine (which was deleted in r2966 to implement an adaptative timestep within the "improvedclouds" subroutine).

Resuls are now consistent in 1D with code versions before r2966).
JBC

File:

• trunk/LMDZ.MARS/libf/phymars/watercloud_mod.F (modified) (5 diffs)

trunk/LMDZ.MARS/libf/phymars/watercloud_mod.F

@@ -51 +51 @@
 c
 c     2023: J. Naar, now with adaptative timestep for improvedclouds
-c          (done in improvedclouds_mod). 
+c           (done in improvedclouds).
+c     2025: J.-B. Clement, bringing the old imicro back again for simpleclouds
 c=======================================================================
 
@@ -110 +111 @@
 
       ! global tendency (clouds+physics)
-      ! JN : keeping this for simpleclouds scheme
       REAL sum_subpdq(ngrid,nlay,nq)      ! cf. pdqcloud
       REAL sum_subpdt(ngrid,nlay)         ! cf. pdtcloud
@@ -202 +202 @@
       rhocloud(1:ngrid,1:nlay) = rho_dust
 
-c-------------------------------------------------------------------
-c   0.  Representation of sub-grid water ice clouds
-c------------------
+c------------------------------------------------------------------
+c   Representation of sub-grid water ice clouds
+c------------------------------------------------------------------
 c-----Initialization
       pteff(1:ngrid,1:nlay) = 0
@@ -299 +299 @@
 !     &             'K',cloudfrac(:,:))
       END IF ! end if (CLFvarying)
+
 c------------------------------------------------------------------
-c Cloud physics (nucleation, condensation / sublimation)
+c   Cloud physics (nucleation, condensation / sublimation)
 c------------------------------------------------------------------ 
       rhocloud(1:ngrid,1:nlay) = rho_dust
 
-c     Initialisation of all the stuff (JN,2023)
+c Initialisation of all the stuff (JN,2023)
       zt_micro(:,:)=pt(:,:)
       zq_micro(:,:,:)=pq(:,:,:)
 
-c-------------------------------------------------------------------
-c   1.  Main call to the different cloud schemes:
-c------------------------------------------------
-c ds.
+c------------------------------------------------------------------
+c   Main call to the different cloud schemes
+c------------------------------------------------------------------
       IF (microphys) THEN
-           CALL improvedclouds(ngrid,nlay,ptimestep,
+        call improvedclouds(ngrid,nlay,ptimestep,
      &          pplay,pt,pdt,pq,pdq,nq,tauscaling,imicro,
      &          zt_micro,zq_micro)
 
       ELSE
-
-c Specific loop for simpleclouds.
-       DO l=1,nlay
-         DO ig=1,ngrid
-           CALL simpleclouds(ngrid,nlay,ptimestep,
-     &             pplay,pzlay,pteff,sum_subpdt,
-     &             pqeff,sum_subpdq,subpdqcloud,subpdtcloud,
-     &             nq,tau,rice)
-c-------------------------------------------------------------------
-c   2.  Updating tracers and temperature after cloud scheme:
-c   For improved clouds (with microphysics) this is done directly
-c   in the microphysics, during the subtimestep
-c   I put it like that to be retrocompatible (JN)
-c-----------------------------------------------
-
-            zq_micro(ig,l,igcm_h2o_ice) =
-     &       zq_micro(ig,l,igcm_h2o_ice)+
-     &         (pdq(ig,l,igcm_h2o_ice)
-     &        + subpdqcloud(ig,l,igcm_h2o_ice))*ptimestep
-            zq_micro(ig,l,igcm_h2o_vap) =
-     &       zq_micro(ig,l,igcm_h2o_vap)+
-     &         (pdq(ig,l,igcm_h2o_vap)
-     &        + subpdqcloud(ig,l,igcm_h2o_vap))*ptimestep
-
-            IF (hdo) THEN
-            zq_micro(ig,l,igcm_hdo_ice) =
-     &       zq_micro(ig,l,igcm_hdo_ice)+
-     &         (pdq(ig,l,igcm_hdo_ice)
-     &        + subpdqcloud(ig,l,igcm_hdo_ice))*ptimestep
-            zq_micro(ig,l,igcm_hdo_vap) =
-     &       zq_micro(ig,l,igcm_hdo_vap)+
-     &         (pdq(ig,l,igcm_hdo_vap)
-     &        + subpdqcloud(ig,l,igcm_hdo_vap))*ptimestep
-            ENDIF ! hdo
-
-c  Could also set subpdtcloud to 0 if not activice to make it simpler
-c  or change name of the flag
-            IF (activice) THEN
-                zt_micro(ig,l) = zt_micro(ig,l)+
-     &             subpdtcloud(ig,l)*ptimestep
-            ENDIF
-
-         ENDDO !ig=1,ngrid
-       ENDDO !l=1,nlay
-      ENDIF
-
-
-      
-c-------------------------------------------------------------------
-c   3.  Compute final tendencies after time loop:
-c------------------------------------------------
+c Time subsampling for microphysics
+        DO microstep = 1,imicro 
+c       Tendencies: 
+c------------------
+c------ Temperature tendency subpdt
+        ! Each microtimestep we give the cloud scheme a stepped entry subpdt instead of pdt
+        ! If imicro=1 subpdt is the same as pdt
+          DO l = 1,nlay
+            DO ig = 1,ngrid
+               sum_subpdt(ig,l) = sum_subpdt(ig,l) + pdt(ig,l) ! At each micro timestep we add pdt in order to have a stepped entry
+            ENDDO
+          ENDDO
+c------ Tracers tendencies subpdq are additionned
+c------ At each micro timestep we add pdq in order to have a stepped entry
+          DO l = 1,nlay
+            DO ig = 1,ngrid
+              sum_subpdq(ig,l,igcm_h2o_ice) = 
+     &            sum_subpdq(ig,l,igcm_h2o_ice) + pdq(ig,l,igcm_h2o_ice)
+              sum_subpdq(ig,l,igcm_h2o_vap) = 
+     &            sum_subpdq(ig,l,igcm_h2o_vap) + pdq(ig,l,igcm_h2o_vap)
+              IF (hdo) THEN
+              sum_subpdq(ig,l,igcm_hdo_ice) = 
+     &            sum_subpdq(ig,l,igcm_hdo_ice) + pdq(ig,l,igcm_hdo_ice)
+              sum_subpdq(ig,l,igcm_hdo_vap) = 
+     &            sum_subpdq(ig,l,igcm_hdo_vap) + pdq(ig,l,igcm_hdo_vap)
+              ENDIF !hdo
+            ENDDO
+          ENDDO      
+          call simpleclouds(ngrid,nlay,microtimestep,
+     &            pplay,pzlay,pteff,sum_subpdt,
+     &            pqeff,sum_subpdq,subpdqcloud,subpdtcloud,nq,tau,rice)
+          DO l = 1,nlay
+            DO ig = 1,ngrid
+              sum_subpdq(ig,l,igcm_h2o_ice) =
+     &            sum_subpdq(ig,l,igcm_h2o_ice)
+     &            + subpdqcloud(ig,l,igcm_h2o_ice)
+              sum_subpdq(ig,l,igcm_h2o_vap) =
+     &            sum_subpdq(ig,l,igcm_h2o_vap)
+     &            + subpdqcloud(ig,l,igcm_h2o_vap)
+
+              IF (hdo) THEN
+                sum_subpdq(ig,l,igcm_hdo_ice) =
+     &              sum_subpdq(ig,l,igcm_hdo_ice)
+     &              + subpdqcloud(ig,l,igcm_hdo_ice)
+                sum_subpdq(ig,l,igcm_hdo_vap) =
+     &              sum_subpdq(ig,l,igcm_hdo_vap)
+     &              + subpdqcloud(ig,l,igcm_hdo_vap)
+              ENDIF ! hdo
+            ENDDO
+          ENDDO
+        
+          IF (activice) THEN
+            DO l = 1,nlay
+              DO ig = 1,ngrid
+                sum_subpdt(ig,l) = sum_subpdt(ig,l) + subpdtcloud(ig,l)
+              ENDDO
+            ENDDO
+          ENDIF
+        ENDDO ! of DO microstep = 1,imicro
+
+c------ Updating tracers and temperature to be consistent 
+c------ with the variables used for the improvedclouds scheme
+        zt_micro(:,:) = pt(:,:) + ptimestep*sum_subpdt(:,:)/real(imicro)
+        zq_micro(:,:,:) = pq(:,:,:)
+     &                    + ptimestep*sum_subpdq(:,:,:)/real(imicro)
+
+      ENDIF ! microphys
+
+c------------------------------------------------------------------
+c   Compute final tendencies after time loop:
+c------------------------------------------------------------------
 
 c------ Temperature tendency pdtcloud
@@ -725 +745 @@
        end subroutine end_watercloud_mod
 
-
-
       END MODULE watercloud_mod