Changeset 4819 for LMDZ6/trunk/libf/phylmdiso

Timestamp:

Feb 14, 2024, 8:55:10 PM (8 months ago)

Author:

evignon

Message:

modifications du commit precedent a la suite de l'atelier nuages

Location:

LMDZ6/trunk/libf/phylmdiso

Files:

• phys_local_var_mod.F90 (modified) (3 diffs)
• phys_output_ctrlout_mod.F90 (modified) (1 diff)
• physiq_mod.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/phylmdiso/phys_local_var_mod.F90

@@ -640 +640 @@
 
 !--POPRECIP variables
+      REAL, SAVE, ALLOCATABLE :: qrain_lsc(:,:)
+      !$OMP THREADPRIVATE(qrain_lsc)
+      REAL, SAVE, ALLOCATABLE :: qsnow_lsc(:,:)
+      !$OMP THREADPRIVATE(qsnow_lsc)
       REAL, SAVE, ALLOCATABLE :: dqreva(:,:)
       !$OMP THREADPRIVATE(dqreva)
@@ -1116 +1120 @@
 !--POPRECIP variables
       ALLOCATE(dqreva(klon,klev),dqssub(klon,klev))
+      ALLOCATE(qrain_lsc(klon,klev), qsnow_lsc(klon,klev)) 
       ALLOCATE(dqrauto(klon,klev), dqrcol(klon,klev), dqrmelt(klon,klev), dqrfreez(klon,klev))
       ALLOCATE(dqsauto(klon,klev), dqsagg(klon,klev), dqsrim(klon,klev), dqsmelt(klon,klev), dqsfreez(klon,klev))
@@ -1478 +1483 @@
 
 !--POPRECIP variables
+      DEALLOCATE(qrain_lsc, qsnow_lsc) 
       DEALLOCATE(dqreva,dqssub)
       DEALLOCATE(dqrauto,dqrcol,dqrmelt,dqrfreez)

LMDZ6/trunk/libf/phylmdiso/phys_output_ctrlout_mod.F90

@@ -1477 +1477 @@
   TYPE(ctrl_out), SAVE :: o_pfracld = ctrl_out((/ 11, 11, 11, 11, 11, 11, 11, 11, 11, 11/), &
     'pfracld', 'LS precipitation fraction cloudy part', '-', (/ ('', i=1, 10) /))
+  TYPE(ctrl_out), SAVE :: o_qrainlsc = ctrl_out((/ 11, 11, 11, 11, 11, 11, 11, 11, 11, 11/), &
+    'qrainlsc', 'LS specific rain content', 'kg/kg', (/ ('', i=1, 10) /))
+  TYPE(ctrl_out), SAVE :: o_qsnowlsc = ctrl_out((/ 11, 11, 11, 11, 11, 11, 11, 11, 11, 11/), &
+    'qsnowlsc', 'LS specific snow content', 'kg/kg', (/ ('', i=1, 10) /)) 
   TYPE(ctrl_out), SAVE :: o_dqreva = ctrl_out((/ 11, 11, 11, 11, 11, 11, 11, 11, 11, 11/), &
-    'dqreva', 'LS rain tendency due to evaporation', 'kg/m2/s', (/ ('', i=1, 10) /))
+    'dqreva', 'LS rain tendency due to evaporation', 'kg/kg/s', (/ ('', i=1, 10) /))
    TYPE(ctrl_out), SAVE :: o_dqrauto = ctrl_out((/ 11, 11, 11, 11, 11, 11, 11, 11, 11, 11/), &
-    'dqrauto', 'LS rain tendency due to autoconversion', 'kg/m2/s', (/ ('', i=1, 10) /))
+    'dqrauto', 'LS rain tendency due to autoconversion', 'kg/kg/s', (/ ('', i=1, 10) /))
   TYPE(ctrl_out), SAVE :: o_dqrcol = ctrl_out((/ 11, 11, 11, 11, 11, 11, 11, 11, 11, 11/), &
-    'dqrcol', 'LS rain tendency due to collection', 'kg/m2/s', (/ ('', i=1, 10) /))
+    'dqrcol', 'LS rain tendency due to collection', 'kg/kg/s', (/ ('', i=1, 10) /))
   TYPE(ctrl_out), SAVE :: o_dqrmelt = ctrl_out((/ 11, 11, 11, 11, 11, 11, 11, 11, 11, 11/), &
-    'dqrmelt', 'LS rain tendency due to melting', 'kg/m2/s', (/ ('', i=1, 10) /))
+    'dqrmelt', 'LS rain tendency due to melting', 'kg/kg/s', (/ ('', i=1, 10) /))
   TYPE(ctrl_out), SAVE :: o_dqrfreez = ctrl_out((/ 11, 11, 11, 11, 11, 11, 11, 11, 11, 11/), &
-    'dqrfreez', 'LS rain tendency due to freezing', 'kg/m2/s', (/ ('', i=1, 10) /))
+    'dqrfreez', 'LS rain tendency due to freezing', 'kg/kg/s', (/ ('', i=1, 10) /))
   TYPE(ctrl_out), SAVE :: o_dqssub = ctrl_out((/ 11, 11, 11, 11, 11, 11, 11, 11, 11, 11/), &
-    'dqssub', 'LS snow tendency due to sublimation', 'kg/m2/s', (/ ('', i=1, 10) /))
+    'dqssub', 'LS snow tendency due to sublimation', 'kg/kg/s', (/ ('', i=1, 10) /))
   TYPE(ctrl_out), SAVE :: o_dqsauto = ctrl_out((/ 11, 11, 11, 11, 11, 11, 11, 11, 11, 11/), &
-    'dqsauto', 'LS snow tendency due to autoconversion', 'kg/m2/s', (/ ('', i=1, 10) /))
+    'dqsauto', 'LS snow tendency due to autoconversion', 'kg/kg/s', (/ ('', i=1, 10) /))
   TYPE(ctrl_out), SAVE :: o_dqsagg = ctrl_out((/ 11, 11, 11, 11, 11, 11, 11, 11, 11, 11/), &
-    'dqsagg', 'LS snow tendency due to aggragation', 'kg/m2/s', (/ ('', i=1, 10) /))
+    'dqsagg', 'LS snow tendency due to aggregation', 'kg/kg/s', (/ ('', i=1, 10) /))
   TYPE(ctrl_out), SAVE :: o_dqsrim = ctrl_out((/ 11, 11, 11, 11, 11, 11, 11, 11, 11, 11/), &
-    'dqsrim', 'LS snow tendency due to riming', 'kg/m2/s', (/ ('', i=1, 10) /))
+    'dqsrim', 'LS snow tendency due to riming', 'kg/kg/s', (/ ('', i=1, 10) /))
   TYPE(ctrl_out), SAVE :: o_dqsmelt = ctrl_out((/ 11, 11, 11, 11, 11, 11, 11, 11, 11, 11/), &
-    'dqsmelt', 'LS snow tendency due to melting', 'kg/m2/s', (/ ('', i=1, 10) /))
+    'dqsmelt', 'LS snow tendency due to melting', 'kg/kg/s', (/ ('', i=1, 10) /))
   TYPE(ctrl_out), SAVE :: o_dqsfreez = ctrl_out((/ 11, 11, 11, 11, 11, 11, 11, 11, 11, 11/), &
-    'dqsfreez', 'LS snow tendency due to freezing', 'kg/m2/s', (/ ('', i=1, 10) /))
+    'dqsfreez', 'LS snow tendency due to freezing', 'kg/kg/s', (/ ('', i=1, 10) /))
   TYPE(ctrl_out), SAVE :: o_rhum = ctrl_out((/ 2, 5, 10, 10, 10, 10, 11, 11, 11, 11/), &
     'rhum', 'Relative humidity', '-', (/ ('', i=1, 10) /))

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -230 +230 @@
        d_q_ch4, &
        ! proprecip
+       qrain_lsc, qsnow_lsc, &
        dqreva, dqssub, &
        dqrauto,dqrcol,dqrmelt,dqrfreez, &
@@ -4890 +4891 @@
          Tcontr, qcontr, qcontr2, fcontrN, fcontrP , &
          cloudth_sth,cloudth_senv,cloudth_sigmath,cloudth_sigmaenv, &
-         dqreva,dqssub,dqrauto,dqrcol,dqrmelt,dqrfreez,dqsauto,dqsagg,dqsrim,dqsmelt,dqsfreez)
+         qrain_lsc, qsnow_lsc, dqreva, dqssub, dqrauto, dqrcol, dqrmelt, &
+         dqrfreez, dqsauto, dqsagg, dqsrim, dqsmelt, dqsfreez)