Changeset 3411 for LMDZ6/branches/DYNAMICO-conv/libf/phylmd/dyn1d/lmdz1d.F90

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/lmdz1d.F90 (modified) (5 diffs)

LMDZ6/branches/DYNAMICO-conv/libf/phylmd/dyn1d/lmdz1d.F90

@@ -286 +286 @@
        hthturb_gcssold = 0.
        hqturb_gcssold = 0.
-
-
-
 
 !---------------------------------------------------------------------
@@ -512 +509 @@
       call ymds2ju(annee_ref,mois,day_ref,heure,day)
       day_ini = int(day)
-      day_end = day_ini + int(fnday)
+      day_end = day_ini + fnday
 
       IF (forcing_type .eq.2) THEN
@@ -585 +582 @@
       call infotrac_init 
 
-      if (nqtot>nqmx) STOP 'Augmenter nqmx dans lmdz1d.F'
+      if (nqtot>nqmx) STOP'Augmenter nqmx dans lmdz1d.F'
       allocate(q(llm,nqtot)) ; q(:,:)=0.
       allocate(dq(llm,nqtot)) 
@@ -988 +985 @@
 !
 !=====================================================================
-       CALL iophys_ini
 ! START OF THE TEMPORAL LOOP :
 !=====================================================================
@@ -1113 +1109 @@
       endif     
 !RC
-      if (forcing_sandu) then
-         ug(1:llm)=u_mod(1:llm)
-         vg(1:llm)=v_mod(1:llm)
-      endif
 
       IF (prt_level >= 5) print*, 'fcoriolis, xlat,mxcalc ', &
                                    fcoriolis, xlat,mxcalc
 
+       du_age(1:mxcalc)=fcoriolis*(v(1:mxcalc)-vg(1:mxcalc))
+       dv_age(1:mxcalc)=-fcoriolis*(u(1:mxcalc)-ug(1:mxcalc))
 !       print *,'u-ug=',u-ug
 
 !!!!!!!!!!!!!!!!!!!!!!!!
 ! Geostrophic wind
-! Le calcul ci dessous est insuffisamment precis
-!      du_age(1:mxcalc)=fcoriolis*(v(1:mxcalc)-vg(1:mxcalc))
-!      dv_age(1:mxcalc)=-fcoriolis*(u(1:mxcalc)-ug(1:mxcalc))
 !!!!!!!!!!!!!!!!!!!!!!!!
        sfdt = sin(0.5*fcoriolis*timestep)