Changeset 2920 for LMDZ5/trunk/libf/phylmd/dyn1d/1DUTILS.h

Timestamp:

Jun 29, 2017, 11:58:07 AM (7 years ago)

Author:

fhourdin

Message:

Modification 1D pour le format standard (Marie-Pierre)

File:

• LMDZ5/trunk/libf/phylmd/dyn1d/1DUTILS.h (modified) (13 diffs)

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

@@ -482 +482 @@
        forc_omega =0
        CALL getin('forc_omega',forc_omega)
+
+!Config  Key  = forc_u
+!Config  Desc = forcage ou non par u
+!Config  Def  = false
+!Config  Help = forcage ou non par u
+       forc_u =0
+       CALL getin('forc_u',forc_u)
+
+!Config  Key  = forc_v
+!Config  Desc = forcage ou non par v
+!Config  Def  = false
+!Config  Help = forcage ou non par v
+       forc_v =0
+       CALL getin('forc_v',forc_v)
 
 !Config  Key  = forc_w
@@ -653 +667 @@
 
       modname = 'dyn1deta0 : '
-!!      nmq(1)="vap"
-!!      nmq(2)="cond"
-!!      do iq=3,nqtot
-!!        write(nmq(iq),'("tra",i1)') iq-2
-!!      enddo
-      DO iq = 1,nqtot
-        nmq(iq) = trim(tname(iq))
-      ENDDO
+      nmq(1)="vap"
+      nmq(2)="cond"
+      do iq=3,nqtot
+        write(nmq(iq),'("tra",i1)') iq-2
+      enddo
       print*,'in dyn1deta0 ',fichnom,klon,klev,nqtot
       CALL open_startphy(fichnom)
@@ -807 +818 @@
       CALL open_restartphy(fichnom)
       print*,'redm1 ',fichnom,klon,klev,nqtot
-!!      nmq(1)="vap"
-!!      nmq(2)="cond"
-!!      nmq(3)="tra1"
-!!      nmq(4)="tra2"
-      DO iq = 1,nqtot
-        nmq(iq) = trim(tname(iq))
-      ENDDO
+      nmq(1)="vap"
+      nmq(2)="cond"
+      nmq(3)="tra1"
+      nmq(4)="tra2"
 
       modname = 'dyn1dredem'
@@ -1396 +1404 @@
       cor(:) = rkappa*temp*(1.+q(:,1)*rv/rd)/(play*(1.+q(:,1)))
 
-
       do k=2,llm-1
 
@@ -2789 +2796 @@
          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)
@@ -2816 +2822 @@
          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)
@@ -2845 +2850 @@
          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
@@ -5025 +5029 @@
       REAL tau
 !c      DATA tau /3600./
-!      DATA tau /5400./
-       DATA tau /43200./
+      DATA tau /5400./
 !
    INTEGER k,i
@@ -5038 +5041 @@
         DO k = 1,klev
          DO i = 1,klon
-!CR: nudging everywhere
-!           IF (paprs(i,1)-pplay(i,k) .GT. 10000.) THEN
+           IF (paprs(i,1)-pplay(i,k) .GT. 10000.) THEN
 !
             d_u(i,k) = d_u(i,k) + 1./tau*(u_targ(i,k)-u(i,k))
@@ -5046 +5048 @@
             print *,' k,u,d_u,v,d_v ',    &
                       k,u(i,k),d_u(i,k),v(i,k),d_v(i,k)
-!           ENDIF
+           ENDIF
 !
          ENDDO
@@ -5173 +5175 @@
          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)
@@ -5210 +5211 @@
          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)
@@ -5247 +5247 @@
          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