Changeset 5728 for LMDZ6/branches/contrails/libf/phylmd/lmdz_lscp_main.f90

Timestamp:

Jun 27, 2025, 7:30:06 PM (5 weeks ago)

Author:

aborella

Message:

Correction to rare floating point errors + added support for the sedimentation of contrails

File:

• LMDZ6/branches/contrails/libf/phylmd/lmdz_lscp_main.f90 (modified) (11 diffs)

LMDZ6/branches/contrails/libf/phylmd/lmdz_lscp_main.f90

@@ -137 +137 @@
 USE phys_local_var_mod, ONLY : dcfl_cir, dqtl_cir, dcfl_mix, dqil_mix, dqtl_mix
 USE phys_local_var_mod, ONLY : dcfc_sub, dqic_sub, dqtc_sub, dcfc_mix, dqic_mix, dqtc_mix
+USE phys_local_var_mod, ONLY : dcfl_sed, dqil_sed, dqtl_sed, dcfc_sed, dqic_sed, dqtc_sed
 USE geometry_mod, ONLY: longitude_deg, latitude_deg
 
@@ -464 +465 @@
 shear(:)        = 0.
 flsed(:)        = 0.
+flsed_lincont(:)= 0.
+flsed_circont(:)= 0.
 pt_pron_clds(:) = .FALSE.
 
@@ -570 +573 @@
       CALL poprecip_precld(klon, dtime, iftop, paprs(:,k), paprs(:,k+1), zp, &
                         zt, ztupnew, zq, zmqc, znebprecipclr, znebprecipcld, &
-                        zqvapclr, zqupnew, flsed, &
+                        zqvapclr, zqupnew, flsed, flsed_lincont, flsed_circont, &
                         cldfra_in, qvc_in, qliq_in, qice_in, &
                         zrfl, zrflclr, zrflcld, &
@@ -581 +584 @@
 
       CALL histprecip_precld(klon, dtime, iftop, paprs(:,k), paprs(:,k+1), zp, &
-                        zt, ztupnew, zq, zmqc, zneb, znebprecip, znebprecipclr, flsed, &
+                        zt, ztupnew, zq, zmqc, zneb, znebprecip, znebprecipclr, &
+                        flsed, flsed_lincont, flsed_circont, &
                         zrfl, zrflclr, zrflcld, &
                         zifl, ziflclr, ziflcld, &
@@ -939 +943 @@
                         dcfl_cir(:,k), dqtl_cir(:,k), &
                         dcfl_mix(:,k), dqil_mix(:,k), dqtl_mix(:,k), &
+                        dcfl_sed(:,k), dqil_sed(:,k), dqtl_sed(:,k), &
+                        dcfc_sed(:,k), dqic_sed(:,k), dqtc_sed(:,k), &
                         dcfc_sub(:,k), dqic_sub(:,k), dqtc_sub(:,k), &
                         dcfc_mix(:,k), dqic_mix(:,k), dqtc_mix(:,k))
@@ -1099 +1105 @@
 
                         IF ( ok_ice_sedim ) THEN
-                          qice_sedim = flsed(i) / ( paprs(i,k) - paprs(i,k+1) ) * RG * dtime
+                          qice_sedim = (flsed(i) + flsed_lincont(i) + flsed_circont(i)) &
+                              / ( paprs(i,k) - paprs(i,k+1) ) * RG * dtime
                           ! Add the ice that was sedimented, as it is not included in zqn
                           qlibef(i) = qlibef(i) + qice_sedim
@@ -1179 +1186 @@
 
                 IF ( ok_ice_sedim ) THEN
-                  qice_sedim = flsed(i) / ( paprs(i,k) - paprs(i,k+1) ) * RG * dtime
+                  qice_sedim = (flsed(i) + flsed_lincont(i) + flsed_circont(i)) &
+                      / ( paprs(i,k) - paprs(i,k+1) ) * RG * dtime
                   ! Remove the ice that was sedimented. As it is not included in zqn,
                   ! we only remove it from the total water
@@ -1248 +1256 @@
                             ctot_vol(:,k), ptconv(:,k), &
                             zt, zq, zoliql, zoliqi, zfice, &
-                            rneb(:,k), flsed, znebprecipclr, znebprecipcld, &
+                            rneb(:,k), znebprecipclr, znebprecipcld, &
                             zrfl, zrflclr, zrflcld, &
                             zifl, ziflclr, ziflcld, &
@@ -1265 +1273 @@
       CALL histprecip_postcld(klon, dtime, iftop, paprs(:,k), paprs(:,k+1), zp, &
                             ctot_vol(:,k), ptconv(:,k), pt_pron_clds, zdqsdT_raw, &
-                            zt, zq, zoliq, zoliql, zoliqi, zcond, zfice, zmqc, flsed, &
+                            zt, zq, zoliq, zoliql, zoliqi, zcond, zfice, zmqc, &
                             rneb(:,k), znebprecipclr, znebprecipcld, &
                             zneb, tot_zneb, zrho_up, zvelo_up, &
@@ -1429 +1437 @@
         !--the sink of condensed water from precipitation
         IF ( ptconv(i,k) ) THEN
-          IF ( zoliq(i) .GT. 0. ) THEN
+          IF ( zcond(i) .GT. 0. ) THEN
             qvcon_old(i,k) = qvcon(i,k)
             qccon_old(i,k) = qccon(i,k) * zoliq(i) / zcond(i)
@@ -1572 +1580 @@
   IF ( ok_ice_sedim ) THEN
     DO i = 1, klon
-      snow(i) = snow(i) + flsed(i)
+      snow(i) = snow(i) + flsed(i) + flsed_lincont(i) + flsed_circont(i)
     ENDDO
   ENDIF