Changeset 2467 for LMDZ5/trunk/libf/phylmd

Timestamp:

Mar 15, 2016, 11:00:01 AM (9 years ago)

Author:

idelkadi

Message:

Utilisiation de la routine getin pour lire des parametres de la parametrization de la convection et nuages.
Passage des fichiers conv_param.data et ep_param.data a conv_param.def et de wake_param.data a wake_param.def

Location:

LMDZ5/trunk/libf/phylmd

Files:

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

LMDZ5/trunk/libf/phylmd/cv3_routines.F90

@@ -7 +7 @@
 SUBROUTINE cv3_param(nd, k_upper, delt)
 
+  USE IOIPSL, ONLY : getin
   use mod_phys_lmdz_para
   IMPLICIT NONE
@@ -39 +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.
+  REAL, 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
+!$OMP
+!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) 
 
 
@@ -65 +87 @@
 
   IF (first) THEN
-
 ! -- "microphysical" parameters:
-    sigdz = 0.01
-    spfac = 0.15
-    pbcrit = 150.0
-    ptcrit = 500.0
 ! IM beg: ajout fis. reglage ep
-    flag_epkeorig = 1
-    elcrit = 0.0003
-    tlcrit = -55.0
 ! CR+JYG: shedding coefficient (used when iflag_mix_adiab=1)
-    coef_peel = 0.25
 ! IM lu dans physiq.def via conf_phys.F90     epmax  = 0.993
 
@@ -82 +95 @@
 
 ! -- misc:
-
     dtovsh = -0.2 ! dT for overshoot
-    dpbase = -40. ! definition cloud base (400m above LCL)
 ! cc      dttrig = 5.   ! (loose) condition for triggering
     dttrig = 10. ! (loose) condition for triggering
-    flag_wb = 1
-    wbmax = 6. ! (m/s) adiab updraught speed at LFC (used in cv3p1_closure)
-
-! -- rate of approach to quasi-equilibrium:
-
     dtcrit = -2.0
-    tau = 8000.
 
 ! -- end of convection
 
-    tau_stop = 15000.
-    ok_convstop = .False.
-
-    ok_intermittent = .False.
-
 ! -- interface cloud parameterization:
 
@@ -111 +111 @@
 
    !$OMP MASTER
-    OPEN (99, FILE='conv_param.data', STATUS='old', FORM='formatted', ERR=9999)
-    READ (99, *, END=9998) dpbase
-    READ (99, *, END=9998) pbcrit
-    READ (99, *, END=9998) ptcrit
-    READ (99, *, END=9998) sigdz
-    READ (99, *, END=9998) spfac
-    READ (99, *, END=9998) tau
-    READ (99, *, END=9998) flag_wb
-    READ (99, *, END=9998) wbmax
-    READ (99, *, END=9998) ok_convstop
-    READ (99, *, END=9998) tau_stop
-    READ (99, *, END=9998) ok_intermittent
-    READ (99, *, END=9998) coef_peel
-9998 CONTINUE
-    CLOSE (99)
-9999 CONTINUE
-    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
-
-! IM Lecture du fichier ep_param.data
-    OPEN (79, FILE='ep_param.data', STATUS='old', FORM='formatted', ERR=7999)
-    READ (79, *, END=7998) flag_epkeorig
-    READ (79, *, END=7998) elcrit
-    READ (79, *, END=7998) tlcrit
-7998 CONTINUE
-    CLOSE (79)
-7999 CONTINUE
-    WRITE (*, *) 'flag_epKEorig', flag_epkeorig
-    WRITE (*, *) 'elcrit=', elcrit
-    WRITE (*, *) 'tlcrit=', tlcrit
-! IM end: ajout fis. reglage ep
-  !$OMP END MASTER
-
-   CALL bcast(dpbase)
-   CALL bcast(pbcrit)
-   CALL bcast(ptcrit)
-   CALL bcast(sigdz)
-   CALL bcast(spfac)
-   CALL bcast(tau)
-   CALL bcast(flag_wb)
-   CALL bcast(wbmax)
-   CALL bcast(ok_convstop)
-   CALL bcast(tau_stop)
-   CALL bcast(ok_intermittent)
-
-   CALL bcast(flag_epkeorig)
-   CALL bcast(elcrit)
-   CALL bcast(tlcrit)
+    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
 
     first = .FALSE.
-
   END IF ! (first)
 
@@ -186 +159 @@
 
   RETURN
-END SUBROUTINE cv3_param
+END SUBROUTINE cv3/_param
 
 SUBROUTINE cv3_incrcount(len, nd, delt, sig)

LMDZ5/trunk/libf/phylmd/wake.F90

@@ -21 +21 @@
   ! **************************************************************
 
+  USE IOIPSL, ONLY : getin
   USE dimphy
   use mod_phys_lmdz_para
@@ -161 +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
   INTEGER nsub
@@ -286 +293 @@
 
  if (first) then
-  stark = 0.33
-  alpk = 0.25
-  wdens_ref = 8.E-12
-  coefgw = 4.
   crep_upper = 0.9
   crep_sol = 1.0
@@ -295 +298 @@
   ! cc nrlmd Lecture du fichier wake_param.data
  !$OMP MASTER
-  OPEN (99, FILE='wake_param.data', STATUS='old', FORM='formatted', ERR=9999)
-  READ (99, *, END=9998) stark
-  READ (99, *, END=9998) alpk
-  READ (99, *, END=9998) wdens_ref
-  READ (99, *, END=9998) coefgw
-9998 CONTINUE
-  CLOSE (99)
-9999 CONTINUE
+  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
-  CALL bcast(stark)
-  CALL bcast(alpk)
-  CALL bcast(wdens_ref)
-  CALL bcast(coefgw)
-
+ !$OMP BARRIER
+  stark=stark_omp
+  alpk=alpk_omp
+  wdens_ref=wdens_ref_omp
+  coefgw=coefgw_omp
   first=.false.
  endif