Changeset 2488 for LMDZ5/branches/testing/libf/phylmd/wake.F90

Timestamp:

Apr 3, 2016, 12:09:34 AM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2457:2487 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/wake.F90 (modified) (3 diffs)

LMDZ5/branches/testing/libf/phylmd/wake.F90

@@ -21 +21 @@
   ! **************************************************************
 
+  USE ioipsl_getin_p_mod, ONLY : getin_p
   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 delta_t_min
   INTEGER nsub
@@ -286 +288 @@
 
  if (first) then
-  stark = 0.33
-  alpk = 0.25
-  wdens_ref = 8.E-12
-  coefgw = 4.
   crep_upper = 0.9
   crep_sol = 1.0
 
   ! 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
- !$OMP END MASTER
-  CALL bcast(stark)
-  CALL bcast(alpk)
-  CALL bcast(wdens_ref)
-  CALL bcast(coefgw)
+  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.