Changeset 5205

Timestamp:

Sep 20, 2024, 2:33:41 PM (3 months ago)

Author:

Laurent Fairhead

Message:

Corrections to previous commit

Location:

LMDZ6/trunk/libf

Files:

• phylmd/dyn1d/old_lmdz1d.F90 (modified) (2 diffs)
• phylmd/dyn1d/scm.F90 (modified) (2 diffs)
• phylmdiso/phys_local_var_mod.F90 (added)
• phylmdiso/phys_output_ctrlout_mod.F90 (added)
• phylmdiso/physiq_mod.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/phylmd/dyn1d/old_lmdz1d.F90

@@ -13 +13 @@
        ftsol, beta_aridity, pbl_tke, pctsrf, radsol, rain_fall, snow_fall, ratqs, &
        rnebcon, rugoro, sig1, w01, solaire_etat0, sollw, sollwdown, &
-       solsw, solswfdiff, t_ancien, q_ancien, u_ancien, v_ancien, rneb_ancien, &
+       solsw, solswfdiff, t_ancien, q_ancien, u_ancien, v_ancien, &
        wake_delta_pbl_TKE, delta_tsurf, wake_fip, wake_pe, &
        wake_deltaq, wake_deltat, wake_s, awake_s, wake_dens, &
@@ -921 +921 @@
         u_ancien(1,:)=u(:)
         v_ancien(1,:)=v(:)
-        rneb_ancien(1,:)=0.
 
         u10m=0.

LMDZ6/trunk/libf/phylmd/dyn1d/scm.F90

@@ -9 +9 @@
        ftsol, beta_aridity, pbl_tke, pctsrf, radsol, rain_fall, snow_fall, ratqs, &
        rnebcon, rugoro, sig1, w01, solaire_etat0, sollw, sollwdown, &
-       solsw, solswfdiff, t_ancien, q_ancien, u_ancien, v_ancien, rneb_ancien, &
+       solsw, solswfdiff, t_ancien, q_ancien, u_ancien, v_ancien, &
        wake_delta_pbl_TKE, delta_tsurf, wake_fip, wake_pe, &
        wake_deltaq, wake_deltat, wake_s, awake_s, wake_dens, &
@@ -679 +679 @@
         u_ancien(1,:)=u(:)
         v_ancien(1,:)=v(:)
-        rneb_ancien(1,:)=0.
  
         u10m=0.

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -1570 +1570 @@
           abort_message='blowing snow cannot be activated with water isotopes yet'
           CALL abort_physic(modname,abort_message, 1)
-         IF ((ok_ice_supersat.AND.nqo .LT.6).OR.(.NOT.ok_ice_supersat.AND.nqo.LT.4)) THEN
+#endif
+         IF ((ok_ice_supersat.AND.nqo .LT.6).OR.(.NOT.ok_ice_supersat.AND.nqo.LT.5)) THEN
              WRITE (lunout, *) 'activation of blowing snow needs a specific H2O tracer', &
                                'but nqo=', nqo
@@ -5099 +5100 @@
          prfl, psfl, rhcl,  &
          zqasc, fraca,ztv,zpspsk,ztla,zthl,iflag_cld_th, &
-         iflag_ice_thermo, distcltop, temp_cltop, 
+         iflag_ice_thermo, distcltop, temp_cltop,  &
          pbl_tke(:,:,is_ave), pbl_eps(:,:,is_ave), &
          cell_area, &