Changeset 3411 for LMDZ6/branches/DYNAMICO-conv/libf/phylmd/dyn1d/1D_nudge_sandu_astex.h

Timestamp:

Nov 5, 2018, 3:24:59 PM (6 years ago)

Author:

Laurent Fairhead

Message:

Undoing merge with trunk (r3356) to properly register Yann's latest modifications

Location:

LMDZ6/branches/DYNAMICO-conv

Files:

• . (modified) (1 prop)
• libf/phylmd/dyn1d/1D_nudge_sandu_astex.h (modified) (2 diffs)

LMDZ6/branches/DYNAMICO-conv/libf/phylmd/dyn1d/1D_nudge_sandu_astex.h

@@ -20 +20 @@
 !     print *,'l dt  relax dtadv',l,dt_phys(l),relax_thl(l),d_t_adv(l)
       enddo
-
-        u(1:mxcalc)=u(1:mxcalc) + timestep*( du_age(1:mxcalc)+             &          
+        u(1:mxcalc)=u(1:mxcalc) + timestep*(                                &          
      &              du_phys(1:mxcalc) - relax_u(1:mxcalc))
-        v(1:mxcalc)=v(1:mxcalc) + timestep*( dv_age(1:mxcalc)+              &
+        v(1:mxcalc)=v(1:mxcalc) + timestep*(                                &
      &               dv_phys(1:mxcalc) - relax_v(1:mxcalc))
+!       q(1:mxcalc,:)=q(1:mxcalc,:)+timestep*(
+!    .              dq(1:mxcalc,:) - relax_q(1:mxcalc,:)+
+!    .              d_q_adv(1:mxcalc,:))
         q(1:mxcalc,1)=q(1:mxcalc,1)+timestep*(                              &
      &      dq(1:mxcalc,1) - relax_q(1:mxcalc,1)+d_q_adv(1:mxcalc,1))
@@ -32 +34 @@
      &      dt_phys(1:mxcalc)-relax_thl(1:mxcalc)+d_t_adv(1:mxcalc))
 
-