Changeset 549

Timestamp:

09/18/17 13:55:05 (7 years ago)

Author:

dubos

Message:

devel : backported commit 544 from trunk

Location:

codes/icosagcm/devel/src/initial

Files:

• etat0.f90 (modified) (2 diffs)
• etat0_heldsz.f90 (modified) (4 diffs)

codes/icosagcm/devel/src/initial/etat0.f90

@@ -16 +16 @@
   USE etat0_database_mod, ONLY: init_etat0_database => init_etat0 
   USE etat0_start_file_mod, ONLY: init_etat0_start_file => init_etat0 
+  USE etat0_heldsz_mod, ONLY: init_etat0_held_suarez => init_etat0 
   IMPLICIT NONE
 
@@ -32 +33 @@
       CASE ('academic')
       CASE ('held_suarez')
+         CALL init_etat0_held_suarez
       CASE ('venus')
       CASE ('dcmip1')

codes/icosagcm/devel/src/initial/etat0_heldsz.f90

@@ -3 +3 @@
   IMPLICIT NONE
   PRIVATE
+  SAVE
 
   TYPE(t_field),POINTER :: f_theta_eq(:)
@@ -12 +13 @@
 !$OMP THREADPRIVATE(done)
 
-  REAL(rstd),SAVE :: teta0,ttp,delt_y,delt_z,eps
-!$OMP THREADPRIVATE(teta0,ttp,delt_y,delt_z,eps)
+  REAL(rstd),SAVE :: p0,teta0,ttp,delt_y,delt_z,eps
+!$OMP THREADPRIVATE(p0,teta0,ttp,delt_y,delt_z,eps)
 
   REAL(rstd),SAVE :: knewt_g, k_f,k_c_a,k_c_s
 !$OMP THREADPRIVATE(knewt_g, k_f,k_c_a,k_c_s)
 
-  PUBLIC :: etat0, held_suarez
+  PUBLIC :: init_etat0, etat0, held_suarez
   
 CONTAINS
@@ -47 +48 @@
   END SUBROUTINE test_etat0_heldsz
 
+  SUBROUTINE init_etat0
+    p0=1e5 ! default value of initial surface pressure as in H&S paper
+    ! p0=101080 for CMIP5 aquaplanets, cf LMDZ5 ini_aqua
+    CALL getin('heldsz_p0',p0)
+  END SUBROUTINE init_etat0
+
   SUBROUTINE etat0(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
     USE theta2theta_rhodz_mod
@@ -78 +85 @@
        phis=f_phis(ind)
        u=f_u(ind)
-       ps(:)=1e5
+       ps(:)=p0
        phis(:)=0.
        u(:,:)=0