Changeset 2988 for trunk

Timestamp:

Jul 3, 2023, 6:40:46 PM (17 months ago)

Author:

jnaar

Message:

Bugfix for commit r2984 which caused improvedclouds to be much more numerically expensive than before (loop on ngrid,nlay within loop on ngrid,nlay). JN

Location:

trunk/LMDZ.MARS

Files:

• changelog.txt (modified) (1 diff)
• libf/phymars/improvedclouds_mod.F (modified) (3 diffs)

trunk/LMDZ.MARS/changelog.txt

@@ -4081 +4081 @@
 retrocompatibility with imicro.
 + simpleclouds working 
+
+== 03/07/2023 == JN
+Bugfix in improvedclouds from previous commit (r2984) where loops on
+(ngrid,nlay) where conducted within big (ngrid,nlay) loop. Two occurrences :
+initialization of zq0 and preventing negative tracers. 

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

@@ -298 +298 @@
         spenttime = 0.
         ending_ts=.false.
-        print*, "ig,l :", ig, l
         DO while (.not.ending_ts)
           microtimestep=ptimestep/real(zimicro(ig,l))
-          zq0(1:ngrid,1:nlay,1:nq) = zq
+c         Initialize tracers for scavenging + hdo computations (JN)
+          DO i=1,nq
+             zq0(ig,l,i)=zq(ig,l,i)
+          ENDDO !i=1,nq
 
           ! Check if we are integrating over ptimestep
@@ -577 +579 @@
      &          subpdtcloud(ig,l))*microtimestep
 
-c         Prevent negative tracers
-          WHERE( zq(1:ngrid,1:nlay,1:nq) < 1.e-30 )
-     &       zq(1:ngrid,1:nlay,1:nq) = 1.e-30
+c         Prevent negative tracers ! JN
+          DO i=1,nq
+            IF(zq(ig,l,i).lt.1.e-30) zq(ig,l,i)=1.e-30
+          ENDDO !i=1,nq
 
 c         Increment time spent in here
@@ -758 +761 @@
 c       zimicro = 30
 c      Coefficients good enough for present-day Mars :
-       alpha = 1.87485684e+09
-       beta = 1.45655856e+00
+c       alpha = 1.87485684e+09
+c       beta = 1.45655856e+00
 c      Coefficients covering high obliquity scenarios :
-c       alpha=3.36711332e+15
-c       beta=1.98636414e+00
+       alpha=3.36711332e+15
+       beta=1.98636414e+00
 c       nimicro=min(max(alpha*abs(potcond)**beta,5.),7000.)
 c       zimicro=ceiling((ptimestep/timeleft)*nimicro)