Changeset 2839 for LMDZ5/branches/testing/libf/phylmd/dyn1d

Timestamp:

Mar 30, 2017, 4:16:38 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2785:2838 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/dyn1d/1DUTILS.h (modified) (6 diffs)
• libf/phylmd/dyn1d/lmdz1d.F90 (modified) (3 diffs)

LMDZ5/branches/testing/libf/phylmd/dyn1d/1DUTILS.h

@@ -2783 +2783 @@
          hq_mod_cas(l)= hq_prof_cas(k2) - frac*(hq_prof_cas(k2)-hq_prof_cas(k1))
          vq_mod_cas(l)= vq_prof_cas(k2) - frac*(vq_prof_cas(k2)-vq_prof_cas(k1))
+         dtrad_mod_cas(l)= dtrad_prof_cas(k2) - frac*(dtrad_prof_cas(k2)-dtrad_prof_cas(k1))
      
          else !play>plev_prof_cas(1)
@@ -2809 +2810 @@
          hq_mod_cas(l)= frac1*hq_prof_cas(k1) - frac2*hq_prof_cas(k2)
          vq_mod_cas(l)= frac1*vq_prof_cas(k1) - frac2*vq_prof_cas(k2)
+         dtrad_mod_cas(l)= frac1*dtrad_prof_cas(k1) - frac2*dtrad_prof_cas(k2)
 
          endif ! play.le.plev_prof_cas(1)
@@ -2837 +2839 @@
          hq_mod_cas(l)= hq_prof_cas(nlev_cas)*fact                            !jyg
          vq_mod_cas(l)= vq_prof_cas(nlev_cas)*fact                            !jyg
+         dtrad_mod_cas(l)= dtrad_prof_cas(nlev_cas)*fact                      !jyg
  
         endif ! play
@@ -5162 +5165 @@
          hq_mod_cas(l)= hq_prof_cas(k2) - frac*(hq_prof_cas(k2)-hq_prof_cas(k1))
          vq_mod_cas(l)= vq_prof_cas(k2) - frac*(vq_prof_cas(k2)-vq_prof_cas(k1))
+         dtrad_mod_cas(l)= dtrad_prof_cas(k2) - frac*(dtrad_prof_cas(k2)-dtrad_prof_cas(k1))
      
          else !play>plev_prof_cas(1)
@@ -5198 +5202 @@
          hq_mod_cas(l)= frac1*hq_prof_cas(k1) - frac2*hq_prof_cas(k2)
          vq_mod_cas(l)= frac1*vq_prof_cas(k1) - frac2*vq_prof_cas(k2)
+         dtrad_mod_cas(l)= frac1*dtrad_prof_cas(k1) - frac2*dtrad_prof_cas(k2)
 
          endif ! play.le.plev_prof_cas(1)
@@ -5234 +5239 @@
          hq_mod_cas(l)= hq_prof_cas(nlev_cas)*fact                     !jyg
          vq_mod_cas(l)= vq_prof_cas(nlev_cas)*fact                     !jyg
+         dtrad_mod_cas(l)= dtrad_prof_cas(nlev_cas)*fact               !jyg
  
         endif ! play

LMDZ5/branches/testing/libf/phylmd/dyn1d/lmdz1d.F90

@@ -40 +40 @@
    USE physiq_mod, ONLY: physiq
    USE comvert_mod, ONLY: presnivs, ap, bp, dpres,nivsig, nivsigs, pa, &
-                          preff
+                          preff, aps, bps, pseudoalt, scaleheight
    USE temps_mod, ONLY: annee_ref, calend, day_end, day_ini, day_ref, &
                         itau_dyn, itau_phy, start_time
@@ -634 +634 @@
         call disvert0(pa,preff,ap,bp,dpres,presnivs,nivsigs,nivsig)
         print *,'On utilise disvert0'
+        aps(1:llm)=0.5*(ap(1:llm)+ap(2:llm+1))
+        bps(1:llm)=0.5*(bp(1:llm)+bp(2:llm+1))
+        scaleheight=8.
+        pseudoalt(1:llm)=-scaleheight*log(presnivs(1:llm)/preff)
       ELSE
         call disvert()
@@ -640 +644 @@
 !       Dans ce cas, on lit ap,bp dans le fichier hybrid.txt
       ENDIF
-      ! initialize ap,bp, etc. in vertical_layers_mod
+
       sig_s=presnivs/preff
       plev =ap+bp*psurf