Changeset 2373

Timestamp:

Oct 13, 2015, 7:28:01 PM (9 years ago)

Author:

jyg

Message:

From MPL:
Correction of some missing initializations in
dyn1D and of two 1D case bugs.

Location:

LMDZ5/trunk/libf/phylmd/dyn1d

Files:

• 1D_decl_cases.h (modified) (1 diff)
• lmdz1d.F90 (modified) (8 diffs)
• mod_1D_amma_read.F90 (modified) (1 diff)
• mod_1D_cases_read.F90 (modified) (1 diff)

LMDZ5/trunk/libf/phylmd/dyn1d/1D_decl_cases.h

@@ -51 +51 @@
         real dth_rico(llm)
         real dqh_rico(llm)
-        real du_age(llm),dv_age(llm)
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! Declarations specifiques au cas TWPice

LMDZ5/trunk/libf/phylmd/dyn1d/lmdz1d.F90

@@ -177 +177 @@
       real :: d_u_nudge(llm),d_v_nudge(llm)
       real :: du_adv(llm),dv_adv(llm)
+      real :: du_age(llm),dv_age(llm)
       real :: alpha
       real :: ttt
@@ -241 +242 @@
 ! INITIALIZATIONS 
 !=====================================================================
+      du_phys(:)=0.
+      dv_phys(:)=0.
+      dt_phys(:)=0.
+      dt_dyn(:)=0.
+      dt_cooling(:)=0.
+      d_th_adv(:)=0.
+      d_t_nudge(:)=0.
+      d_u_nudge(:)=0.
+      d_v_nudge(:)=0.
+      du_adv(:)=0.
+      dv_adv(:)=0.
+      du_age(:)=0.
+      dv_age(:)=0.
+      
 ! Initialization of Common turb_forcing
        dtime_frcg = 0.
@@ -566 +581 @@
       plev =ap+bp*psurf
       play = 0.5*(plev(1:llm)+plev(2:llm+1))
-!cc      zlay=-rd*300.*log(play/psurf)/rg ! moved after reading profiles
+      zlay=-rd*300.*log(play/psurf)/rg ! moved after reading profiles
 
       IF (forcing_type .eq. 59) THEN
@@ -595 +610 @@
 
       print*,'mxcalc=',mxcalc
-      print*,'zlay=',zlay(mxcalc)
+!     print*,'zlay=',zlay(mxcalc)
       print*,'play=',play(mxcalc)
 
@@ -924 +939 @@
          d_q_adv=0.0
        endif
+      print*, 'calcul de fcoriolis ', fcoriolis
 
        if (forcing_toga .or. forcing_GCSSold .or. forcing_twpice            &
@@ -933 +949 @@
         endif
 
-      print*, 'fcoriolis ', fcoriolis, xlat
-
-        du_age(1:mxcalc)=fcoriolis*(v(1:mxcalc)-vg(1:mxcalc))
+      print*, 'fcoriolis ', 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
 
 !!!!!!!!!!!!!!!!!!!!!!!!
@@ -943 +960 @@
        sfdt = sin(0.5*fcoriolis*timestep)
        cfdt = cos(0.5*fcoriolis*timestep)
+       print *,'fcoriolis,sfdt,cfdt,timestep',fcoriolis,sfdt,cfdt,timestep
 !
         du_age(1:mxcalc)= -2.*sfdt/timestep*                                &
@@ -1002 +1020 @@
      &    'physiq-> temp(1),dt_phys(1),d_th_adv(1),dt_cooling(1) ',         &
      &              temp(1),dt_phys(1),d_th_adv(1),dt_cooling(1)
-           print*,du_phys
+           print* ,'dv_phys=',dv_phys
+           print* ,'dv_age=',dv_age
+           print* ,'dv_adv=',dv_adv
+           print* ,'d_v_nudge=',d_v_nudge
            print*, v
            print*, vg

LMDZ5/trunk/libf/phylmd/dyn1d/mod_1D_amma_read.F90

@@ -479 +479 @@
 
 ! time interpolation:
-       frac=(time_amma2-timeit)/(time_amma2-time_amma1)
-       frac=max(frac,0.0)
+       IF (it_amma1 .EQ. it_amma2) THEN
+          frac=0.
+       ELSE 
+          frac=(time_amma2-timeit)/(time_amma2-time_amma1)
+          frac=max(frac,0.0)
+       ENDIF
 
        lat_prof = lat_amma(it_amma2)                                       &

LMDZ5/trunk/libf/phylmd/dyn1d/mod_1D_cases_read.F90

@@ -1100 +1100 @@
 
 ! time interpolation:
-       frac=(time_cas2-timeit)/(time_cas2-time_cas1)
-       frac=max(frac,0.0)
+       IF (it_cas1 .EQ. it_cas2) THEN
+          frac=0.
+       ELSE
+          frac=(time_cas2-timeit)/(time_cas2-time_cas1)
+          frac=max(frac,0.0)
+       ENDIF
 
        lat_prof_cas = lat_cas(it_cas2)                                       &