Changeset 2474

Timestamp:

Mar 22, 2016, 12:13:26 PM (8 years ago)

Author:

idelkadi

Message:

Utilisation de getin_p au lieu de getin pour la lecture des parametres de la convections.

Location:

LMDZ5/trunk/libf/phylmd

Files:

• cv3_routines.F90 (modified) (4 diffs)
• wake.F90 (modified) (3 diffs)

LMDZ5/trunk/libf/phylmd/cv3_routines.F90

@@ -7 +7 @@
 SUBROUTINE cv3_param(nd, k_upper, delt)
 
-  USE IOIPSL, ONLY : getin
+  USE ioipsl_getin_p_mod, ONLY : getin_p
   use mod_phys_lmdz_para
   IMPLICIT NONE
@@ -40 +40 @@
   INTEGER, INTENT(IN)              :: k_upper
   REAL, INTENT(IN)                 :: delt ! timestep (seconds)
-
-! Var interm pour le getin
-  REAL, SAVE :: dpbase_omp=-40.
-  REAL, SAVE :: pbcrit_omp=150.0           
-  REAL, SAVE :: ptcrit_omp=500.0
-  REAL, SAVE :: sigdz_omp=0.01
-  REAL, SAVE :: spfac_omp=0.15
-  REAL, SAVE :: tau_omp=8000.
-  INTEGER, SAVE :: flag_wb_omp=1
-  REAL, SAVE :: wbmax_omp=6.
-  LOGICAL, SAVE :: ok_convstop_omp=.False.
-  REAL, SAVE :: tau_stop_omp=15000.
-  LOGICAL, SAVE :: ok_intermittent_omp=.False.
-  REAL, SAVE :: coef_peel_omp=0.25
-  INTEGER, SAVE :: flag_epKEorig_omp=1   
-  REAL, SAVE :: elcrit_omp=0.0003
-  REAL, SAVE :: tlcrit_omp=-55.0
-
-!THREADPRIVATE(dpbase_omp,pbcrit_omp,ptcrit_omp,sigdz_omp,spfac_omp,tau_omp,flag_wb_omp)
-!THREADPRIVATE(wbmax_omp,ok_convstop_omp,tau_stop_omp,ok_intermittent_omp,coef_peel_omp)
-!THREADPRIVATE(flag_epKEorig_omp,elcrit_omp,tlcrit_omp) 
-
 
 ! Local variables
@@ -93 +71 @@
 
     omtrain = 45.0 ! used also for snow (no disctinction rain/snow)
-
 ! -- misc:
     dtovsh = -0.2 ! dT for overshoot
@@ -99 +76 @@
     dttrig = 10. ! (loose) condition for triggering
     dtcrit = -2.0
-
 ! -- end of convection
-
 ! -- interface cloud parameterization:
-
     delta = 0.01 ! cld
-
 ! -- interface with boundary-layer (gust factor): (sb)
-
     betad = 10.0 ! original value (from convect 4.3)
 
-   !$OMP MASTER
-    CALL getin('dpbase',dpbase_omp)
-     CALL getin('pbcrit',pbcrit_omp)
-     CALL getin('ptcrit',ptcrit_omp)
-     CALL getin('sigdz',sigdz_omp)
-     CALL getin('spfac',spfac_omp)
-     CALL getin('tau',tau_omp)
-     CALL getin('flag_wb',flag_wb_omp)
-     CALL getin('wbmax',wbmax_omp)
-     CALL getin('ok_convstop',ok_convstop_omp)
-     CALL getin('tau_stop',tau_stop_omp)
-     CALL getin('ok_intermittent',ok_intermittent_omp)
-     CALL getin('coef_peel',coef_peel_omp)
-     CALL getin('flag_epKEorig',flag_epKEorig_omp)
-     CALL getin('elcrit',elcrit_omp)
-     CALL getin('tlcrit',tlcrit_omp)
-   !$OMP END MASTER
-   !$OMP BARRIER
-     dpbase=dpbase_omp
-     pbcrit=pbcrit_omp
-     ptcrit=ptcrit_omp
-     sigdz=sigdz_omp
-     spfac=spfac_omp
-     tau=tau_omp
-     flag_wb=flag_wb_omp
-     wbmax=wbmax_omp
-     ok_convstop=ok_convstop_omp
-     tau_stop=tau_stop_omp
-     ok_intermittent=ok_intermittent_omp
-     coef_peel=coef_peel_omp
-     flag_epKEorig=flag_epKEorig_omp
-     elcrit=elcrit_omp
-     tlcrit=tlcrit_omp
-
+! Var interm pour le getin
+     dpbase=-40.
+     CALL getin_p('dpbase',dpbase)
+     pbcrit=150.0
+     CALL getin_p('pbcrit',pbcrit)
+     ptcrit=500.0
+     CALL getin_p('ptcrit',ptcrit)
+     sigdz=0.01
+     CALL getin_p('sigdz',sigdz)
+     spfac=0.15
+     CALL getin_p('spfac',spfac)
+     tau=8000.
+     CALL getin_p('tau',tau)
+     flag_wb=1
+     CALL getin_p('flag_wb',flag_wb)
+     wbmax=6.
+     CALL getin_p('wbmax',wbmax)
+     ok_convstop=.False.
+     CALL getin_p('ok_convstop',ok_convstop)
+     tau_stop=15000.
+     CALL getin_p('tau_stop',tau_stop)
+     ok_intermittent=.False.
+     CALL getin_p('ok_intermittent',ok_intermittent)
+     coef_peel=0.25
+     CALL getin_p('coef_peel',coef_peel)
+
+     flag_epKEorig=1
+     CALL getin_p('flag_epKEorig',flag_epKEorig)
+     elcrit=0.0003
+     CALL getin_p('elcrit',elcrit)
+     tlcrit=-55.0
+     CALL getin_p('tlcrit',tlcrit)
+
+    WRITE (*, *) 'dpbase=', dpbase
+    WRITE (*, *) 'pbcrit=', pbcrit
+    WRITE (*, *) 'ptcrit=', ptcrit
+    WRITE (*, *) 'sigdz=', sigdz
+    WRITE (*, *) 'spfac=', spfac
+    WRITE (*, *) 'tau=', tau
+    WRITE (*, *) 'flag_wb=', flag_wb
+    WRITE (*, *) 'wbmax=', wbmax
+    WRITE (*, *) 'ok_convstop=', ok_convstop
+    WRITE (*, *) 'tau_stop=', tau_stop
+    WRITE (*, *) 'ok_intermittent=', ok_intermittent
+    WRITE (*, *) 'coef_peel=', coef_peel
+
+    WRITE (*, *) 'flag_epKEorig=', flag_epKEorig
+    WRITE (*, *) 'elcrit=', elcrit
+    WRITE (*, *) 'tlcrit=', tlcrit
     first = .FALSE.
   END IF ! (first)

LMDZ5/trunk/libf/phylmd/wake.F90

@@ -21 +21 @@
   ! **************************************************************
 
-  USE IOIPSL, ONLY : getin
+  USE ioipsl_getin_p_mod, ONLY : getin_p
   USE dimphy
   use mod_phys_lmdz_para
@@ -162 +162 @@
   REAL, SAVE ::  stark, wdens_ref, coefgw, alpk, crep_upper, crep_sol  
   !$OMP THREADPRIVATE(stark, wdens_ref, coefgw, alpk, crep_upper, crep_sol)
-  REAL, SAVE ::  stark_omp=0.33
-  REAL, SAVE ::  alpk_omp=0.25
-  REAL, SAVE ::  wdens_ref_omp=8.E-12
-  REAL, SAVE ::  coefgw_omp=4.
-  !$OMP THREADPRIVATE(stark_omp,alpk_omp,wdens_ref_omp,coefgw_omp)
 
   REAL delta_t_min
@@ -297 +292 @@
 
   ! cc nrlmd Lecture du fichier wake_param.data
- !$OMP MASTER
-  CALL getin('stark',stark_omp)
-  CALL getin('alpk',alpk_omp)
-  CALL getin('wdens_ref',wdens_ref_omp)
-  CALL getin('coefgw',coefgw_omp)
- !$OMP END MASTER
- !$OMP BARRIER
-  stark=stark_omp
-  alpk=alpk_omp
-  wdens_ref=wdens_ref_omp
-  coefgw=coefgw_omp
+  stark=0.33
+  CALL getin_p('stark',stark)
+  alpk=0.25
+  CALL getin_p('alpk',alpk)
+  wdens_ref=8.E-12
+  CALL getin_p('wdens_ref',wdens_ref)
+  coefgw=4.
+  CALL getin_p('coefgw',coefgw)
+
+  WRITE(*,*) 'stark=', stark
+  WRITE(*,*) 'alpk=', alpk
+  WRITE(*,*) 'wdens_ref=', wdens_ref
+  WRITE(*,*) 'coefgw=', coefgw 
+
   first=.false.
  endif