Changeset 5218 for LMDZ6/branches/Amaury_dev/libf

Timestamp:

Sep 23, 2024, 2:23:42 PM (3 months ago)

Author:

abarral

Message:

Rename lmdz_xer.f90 to slatec_xer.f90
Rename lmdz_libmath_pch.f90 to slatec_libmath_pch.f90
Merge r5138, r5149 from trunk which had been missed in previous merges

Location:

LMDZ6/branches/Amaury_dev

Files:

• . (modified) (1 prop)
• libf/misc/slatec_libmath_pch.f90 (moved) (moved from LMDZ6/branches/Amaury_dev/libf/misc/lmdz_libmath_pch.f90) (1 diff)
• libf/misc/slatec_xer.f90 (moved) (moved from LMDZ6/branches/Amaury_dev/libf/misc/lmdz_xer.f90)
• libf/phylmd/phys_output_write_mod.F90 (modified) (1 diff)
• libf/phylmdiso/reevap.F90 (modified) (7 diffs)

LMDZ6/branches/Amaury_dev/libf/misc/slatec_libmath_pch.f90

@@ -2 +2 @@
 
 MODULE lmdz_libmath_pch
-  USE lmdz_xer, ONLY: xermsg
+  USE slatec_xer, ONLY: xermsg
   IMPLICIT NONE; PRIVATE
   PUBLIC pchfe_95, pchsp_95

LMDZ6/branches/Amaury_dev/libf/phylmd/phys_output_write_mod.F90

@@ -2921 +2921 @@
             i = INDEX(outiso, '_', .TRUE.)
             outiso = outiso(1:i-1)//outiso(i+1:LEN_TRIM(outiso))
-            ! dayly
-            CALL xios_set_fieldgroup_attr("dd_2D_"//TRIM(outiso), enabled=.TRUE.)
-            CALL xios_set_fieldgroup_attr("dd_3D_"//TRIM(outiso), enabled=.TRUE.)
-            ! monthly
-            CALL xios_set_fieldgroup_attr("mm_2D_"//TRIM(outiso), enabled=.TRUE.)
-            CALL xios_set_fieldgroup_attr("mm_3D_"//TRIM(outiso), enabled=.TRUE.)
+
+            CALL xios_set_fieldgroup_attr("iso2D_"//TRIM(outiso), enabled=.TRUE.)
+            CALL xios_set_fieldgroup_attr("iso3D_"//TRIM(outiso), enabled=.TRUE.)
 
           ENDDO

LMDZ6/branches/Amaury_dev/libf/phylmdiso/reevap.F90

@@ -28 +28 @@
     REAL, DIMENSION(klon,klev,nqtot), INTENT(IN) ::     qx
     REAL, DIMENSION(klon,klev), INTENT(OUT) :: d_t_eva
-    REAL, DIMENSION(klon,klev,nqtot), INTENT(OUT) ::        d_qx_eva
+    REAL, DIMENSION(klon,klev,nqtot), INTENT(OUT) ::    d_qx_eva
 
     REAL za,zb,zdelta,zlvdcp,zlsdcp
@@ -35 +35 @@
     !--------Stochastic Boundary Layer Triggering: ALE_BL--------
 
-DO ixt=1,1+ntiso
+DO ixt = 1, 1+ntiso
     ! Re-evaporer l'eau liquide nuageuse
 
@@ -43 +43 @@
 !PRINT *,'rrevap ; fl_cor_ebil:',fl_cor_ebil,' iflag_ice_thermo:',iflag_ice_thermo,' RVTMP2',RVTMP2
     DO k = 1, klev  ! re-evaporation de l'eau liquide nuageuse
-       DO i = 1, klon
+      DO i = 1, klon
 
-        IF (ixt==1) THEN
+        IF (ixt == 1) THEN ! water
          IF (fl_cor_ebil > 0) THEN
           !zlvdcp=RLVTT/RCPD/(1.0+RVTMP2*(q_seri(i,k)+ql_seri(i,k)+qs_seri(i,k)))
@@ -51 +51 @@
           zlvdcp=RLVTT/RCPD/(1.0+RVTMP2*(qx(i,k,ivapcur)+qx(i,k,iliqcur)+qx(i,k,isolcur)))
           zlsdcp=RLSTT/RCPD/(1.0+RVTMP2*(qx(i,k,ivapcur)+qx(i,k,iliqcur)+qx(i,k,isolcur)))
-         else
+         ELSE
            zlvdcp=RLVTT/RCPD/(1.0+RVTMP2*qx(i,k,ivapcur))
            !jyg<
@@ -57 +57 @@
            !                  A verifier !!!
            zlsdcp=RLSTT/RCPD/(1.0+RVTMP2*qx(i,k,ivapcur))
-         end if
+         END IF
          IF (iflag_ice_thermo == 0) THEN
              zlsdcp=zlvdcp
-         ENDIF
+         END IF
           !>jyg
+        END IF
+        IF (iflag_ice_thermo == 0) THEN
+          !pas necessaire a priori
+
+          zdelta = MAX(0., SIGN(1., RTT - t_seri(i, k)))
+          zdelta = 0.
+          zb = MAX(0.0, qx(i, k, iliqcur))
+          IF (ixt == 1) THEN
+            za = - MAX(0.0, qx(i, k, iliqcur)) &
+                    * (zlvdcp * (1. - zdelta) + zlsdcp * zdelta)
+            d_t_eva(i, k) = za
+          END IF
+          d_qx_eva(i, k, ivapcur) = zb
+          d_qx_eva(i, k, iliqcur) = -qx(i, k, iliqcur)
+          d_qx_eva(i, k, isolcur) = 0.
+
+        ELSE
+
              !CR: on r\'e-\'evapore eau liquide et glace
 
@@ -68 +86 @@
              !        za = - MAX(0.0,ql_seri(i,k)) &
              !             * (zlvdcp*(1.-zdelta)+zlsdcp*zdelta)
-             za = - MAX(0.0,qx(i,k,iliqcur))*zlvdcp &
-                  - MAX(0.0,qx(i,k,iliqcur))*zlsdcp
-             d_t_eva(i,k) = za
+          IF (ixt == 1) THEN
+            za = - MAX(0.0, qx(i, k, iliqcur)) * zlvdcp &
+                    - MAX(0.0, qx(i, k, iliqcur)) * zlsdcp
+            d_t_eva(i, k) = za
 
-          endif !if (ixt.EQ.1) THEN
+          END IF
             !zb = MAX(0.0,ql_seri(i,k)+qs_seri(i,k))
             !d_q_eva(i,k) = zb
@@ -82 +101 @@
             d_qx_eva(i,k,iliqcur) = -qx(i,k,iliqcur)
             d_qx_eva(i,k,isolcur) = -qx(i,k,isolcur)
+        END IF
 
 
-       ENDDO
-    ENDDO
+      END DO
+    END DO
 
-    enddo ! do ixt=1,1+niso*(nzone +1)
-
+    END DO ! DO ixt = 1, 1+niso*(nzone +1)