Changeset 3680 for LMDZ6/trunk/libf/phylmd/dyn1d/scm.F90

Timestamp:

May 26, 2020, 8:10:45 AM (4 years ago)

Author:

fhourdin

Message:

Modifications pour le format standard.
Frédéric pour Marie-Pierre
Frédéric

File:

• LMDZ6/trunk/libf/phylmd/dyn1d/scm.F90 (modified) (3 diffs)

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

@@ -49 +49 @@
 !#include "indicesol.h"
 
-#include "compar1d.h"
+#include "compar1d_std.h"
 #include "flux_arp.h"
 #include "date_cas.h"
@@ -291 +291 @@
 !---------------------------------------------------------------------
 !Al1
-        call conf_unicol
+        call conf_unicol_std
 !Al1 moves this gcssold var from common fcg_gcssold to 
         Turb_fcg_gcssold = xTurb_fcg_gcssold
@@ -1033 +1033 @@
          IF ( play(l) < p_nudging_v .AND. nint(nudging_v) /= 0 ) &
              & d_v_nudge(l)=(v_nudg_mod_cas(l)-v(l))/nudging_v
-         IF ( play(l) < p_nudging_t .AND. nint(nudging_t) /= 0 ) &
-             & d_t_nudge(l)=(temp_nudg_mod_cas(l)-temp(l))/nudging_t
+         IF ( play(l) < p_nudging_temp .AND. nint(nudging_temp) /= 0 ) &
+             & d_t_nudge(l)=(temp_nudg_mod_cas(l)-temp(l))/nudging_temp
          IF ( play(l) < p_nudging_qv .AND. nint(nudging_qv) /= 0 ) &
              & d_q_nudge(l,1)=(qv_nudg_mod_cas(l)-q(l,1))/nudging_qv
+         IF ((adv_temp.eq.1) .and. (forc_w.eq.0)) then
+           d_t_adv(l)=alpha*omega(l)/rcpd+dt_mod_cas(l)
+         ELSE IF ((adv_temp.eq.1) .and. (forc_w.eq.1)) then
+           d_t_adv(l)=alpha*omega(l)/rcpd+ht_mod_cas(l)-d_t_dyn_z(l)
+         ENDIF
+
       ENDDO