Changeset 1520 for LMDZ5/trunk/libf/dyn3dpar/leapfrog_p.F

Timestamp:

May 23, 2011, 1:37:09 PM (13 years ago)

Author:

Ehouarn Millour

Message:

Implementation of a different vertical discretization (from/for planets, but
can in principle also be used for Earth).
Choice of vertical discretization is set by flag 'disvert_type';
'disvert_type=1' is Earth standard (default; ie set to 1 if
planet_type=="earth") case.
With 'disvert_type=2', approximate altitude of layers and reference atmospheric
scale height must be given using an input file ("z2sig.def", first line
should give scale height, in km, following lines must specify the altitude,
in km above surface, of mid-layers, one per line; see disvert_noterre.F).

Checked that these changes do not impact on 'bench' results, on Vargas.

EM.

File:

• LMDZ5/trunk/libf/dyn3dpar/leapfrog_p.F (modified) (5 diffs)

LMDZ5/trunk/libf/dyn3dpar/leapfrog_p.F

@@ -164 +164 @@
 
       character*80 dynhist_file, dynhistave_file
-      character*20 modname
+      character(len=*),parameter :: modname="leapfrog"
       character*80 abort_message
 
@@ -208 +208 @@
       itaufin   = nday*day_step
       itaufinp1 = itaufin +1
-      modname="leapfrog_p"
 
       itau = 0
@@ -236 +235 @@
       dq(:,:,:)=0.
       CALL pression ( ip1jmp1, ap, bp, ps, p       )
-      CALL exner_hyb( ip1jmp1, ps, p,alpha,beta, pks, pk, pkf )
+      if (disvert_type==1) then
+        CALL exner_hyb( ip1jmp1, ps, p,alpha,beta, pks, pk, pkf )
+      else ! we assume that we are in the disvert_type==2 case
+        CALL exner_milieu( ip1jmp1, ps, p, beta, pks, pk, pkf )
+      endif
 c$OMP END MASTER
 c-----------------------------------------------------------------------
@@ -691 +694 @@
 
 c$OMP BARRIER
-         CALL exner_hyb_p(  ip1jmp1, ps, p,alpha,beta,pks, pk, pkf )
+         if (disvert_type==1) then
+           CALL exner_hyb_p(  ip1jmp1, ps, p,alpha,beta,pks, pk, pkf )
+         else ! we assume that we are in the disvert_type==2 case
+           CALL exner_milieu_p( ip1jmp1, ps, p, beta, pks, pk, pkf )
+         endif
 c$OMP BARRIER
            jD_cur = jD_ref + day_ini - day_ref
@@ -1030 +1037 @@
         CALL pression_p ( ip1jmp1, ap, bp, ps, p                  )
 c$OMP BARRIER
-        CALL exner_hyb_p( ip1jmp1, ps, p,alpha,beta, pks, pk, pkf )
+        if (disvert_type==1) then
+          CALL exner_hyb_p( ip1jmp1, ps, p,alpha,beta, pks, pk, pkf )
+        else ! we assume that we are in the disvert_type==2 case
+          CALL exner_milieu_p( ip1jmp1, ps, p, beta, pks, pk, pkf )
+        endif
 c$OMP BARRIER