Changeset 3866

Timestamp:

Jul 23, 2025, 2:32:43 PM (4 weeks ago)

Author:

gmilcareck

Message:

Change the declaration of q from INOUT to IN + change call abort in radioactive_tracers.

Location:

trunk/LMDZ.GENERIC

Files:

• changelog.txt (modified) (1 diff)
• libf/phystd/radioactive_tracers.F90 (modified) (1 diff)
• libf/phystd/thermcell_dq.F90 (modified) (7 diffs)

trunk/LMDZ.GENERIC/changelog.txt

@@ -2092 +2092 @@
 == 23/07/2025 == GM
 Fix bug on variable definition of ap, bp, aps and bps. A scalar was given instead of an array.
+
+== 23/07/2025 == GM
+Change the declaration of q from INOUT to IN + change call abort in radioactive_tracers.

trunk/LMDZ.GENERIC/libf/phystd/radioactive_tracers.F90

@@ -44 +44 @@
             if (half_life(iq)/10 .le. ptimestep) then ! sanity test
                 write(*,*)"timestep is more than half-life / 10 of tracer ", noms(iq)
-                call abort_physic()
+                call abort
             end if ! dt > 0.1 * half_life
             zdqradio(1:ngrid,1:nlayer,iq) = zdqradio(1:ngrid,1:nlayer,iq) - LOG(2.)/half_life(iq)*pq(1:ngrid,1:nlayer,iq) ! <== decay

trunk/LMDZ.GENERIC/libf/phystd/thermcell_dq.F90

@@ -42 +42 @@
       REAL, INTENT(in) :: entr(ngrid,nlay)
       REAL, INTENT(in) :: detr(ngrid,nlay)
+      REAL, INTENT(in) :: q(ngrid,nlay)
       
 !     Outputs:
 !     --------
       
-      REAL, INTENT(inout) :: q(ngrid,nlay)
       REAL, INTENT(out) :: dq(ngrid,nlay)
       REAL, INTENT(out) :: qa(ngrid,nlay)
@@ -59 +59 @@
       REAL qold(ngrid,nlay)
       REAL fqa(ngrid,nlay+1)
+      REAL zq(ngrid,nlay)
       REAL zzm
       
@@ -66 +67 @@
       
       qold(:,:) = q(:,:)
+      zq(:,:) = q(:,:)
       
 !===============================================================================
@@ -104 +106 @@
       !ALS24 initialises qa in first layer
       DO ig=1,ngrid
-         qa(ig,1) = q(ig,1)
+         qa(ig,1) = zq(ig,1)
       ENDDO
 
@@ -110 +112 @@
          DO l=2,nlay
             IF ((fm(ig,l+1)+detr(ig,l))*ptimestep > 1.e-6*masse(ig,l)) THEN
-               qa(ig,l) = (fm(ig,l) * qa(ig,l-1) + entr(ig,l) * q(ig,l))      &
+               qa(ig,l) = (fm(ig,l) * qa(ig,l-1) + entr(ig,l) * zq(ig,l))      &
                &        / (fm(ig,l+1) + detr(ig,l))
             ELSE
-               qa(ig,l) = q(ig,l)
+               qa(ig,l) = zq(ig,l)
             ENDIF
          ENDDO
@@ -135 +137 @@
       IF (dqimpl) THEN
          DO l=nlay-1,1,-1
-            q(:,l) = ( q(:,l) + ptimestep / masse(:,l)                        &
-            &      * ( fqa(:,l) - fqa(:,l+1) + fm(:,l+1) * q(:,l+1) ) )       &
+            zq(:,l) = ( zq(:,l) + ptimestep / masse(:,l)                        &
+            &      * ( fqa(:,l) - fqa(:,l+1) + fm(:,l+1) * zq(:,l+1) ) )       &
             &      / ( 1. + fm(:,l) * ptimestep / masse(:,l) )
          ENDDO
       ELSE
          DO l=1,nlay-1
-            q(:,l) = q(:,l) + (fqa(:,l) - fqa(:,l+1) - fm(:,l) * q(:,l)       &
-            &      + fm(:,l+1) * q(:,l+1)) * ptimestep / masse(:,l)
+            zq(:,l) = zq(:,l) + (fqa(:,l) - fqa(:,l+1) - fm(:,l) * zq(:,l)       &
+            &      + fm(:,l+1) * zq(:,l+1)) * ptimestep / masse(:,l)
          ENDDO
       ENDIF
@@ -152 +154 @@
       DO l=1,nlay
          DO ig=1,ngrid
-            dq(ig,l) = (q(ig,l) - qold(ig,l)) / ptimestep
-            q(ig,l) = qold(ig,l)
+            dq(ig,l) = (zq(ig,l) - qold(ig,l)) / ptimestep
          ENDDO
       ENDDO