Changeset 3036 for LMDZ6/trunk/libf/phylmd

Timestamp:

Oct 23, 2017, 10:10:56 AM (7 years ago)

Author:

fhourdin

Message:

passage de getin a getin_p et supression des
variables _omp qui n'etaient pas en THREADPRIVATE.

File:

• LMDZ6/trunk/libf/phylmd/thermcell_plume.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/phylmd/thermcell_plume.F90

@@ -12 +12 @@
 !--------------------------------------------------------------------------
 USE IOIPSL, ONLY : getin
+USE ioipsl_getin_p_mod, ONLY : getin_p
 
        USE print_control_mod, ONLY: prt_level
@@ -96 +97 @@
       REAL fact_gamma,fact_gamma2,fact_epsilon2
 
-      REAL, SAVE :: fact_epsilon, fact_epsilon_omp=0.002
-      REAL, SAVE :: betalpha, betalpha_omp=0.9
-      REAL, SAVE :: afact, afact_omp=2./3.
-      REAL, SAVE :: fact_shell, fact_shell_omp=1.
-      REAL,SAVE :: detr_min,detr_min_omp=1.e-5
-      REAL,SAVE :: entr_min,entr_min_omp=1.e-5
-      REAL,SAVE :: detr_q_coef,detr_q_coef_omp=0.012
-      REAL,SAVE :: detr_q_power,detr_q_power_omp=0.5
-      REAL,SAVE :: mix0,mix0_omp=0.
-      INTEGER,SAVE :: thermals_flag_alim,thermals_flag_alim_omp=0
+      REAL, SAVE :: fact_epsilon=0.002
+      REAL, SAVE :: betalpha=0.9
+      REAL, SAVE :: afact=2./3.
+      REAL, SAVE :: fact_shell=1.
+      REAL,SAVE :: detr_min=1.e-5
+      REAL,SAVE :: entr_min=1.e-5
+      REAL,SAVE :: detr_q_coef=0.012
+      REAL,SAVE :: detr_q_power=0.5
+      REAL,SAVE :: mix0=0.
+      INTEGER,SAVE :: thermals_flag_alim=0
 
 !$OMP THREADPRIVATE(fact_epsilon, betalpha, afact, fact_shell)
@@ -121 +122 @@
       RLvCp = RLVTT/RCPD
       IF (first) THEN
-     !$OMP MASTER
-! FH : if ok_sync=.true. , the time axis is written at each time step
-! in the output files. Only at the end in the opposite case
-     CALL getin('thermals_fact_epsilon',fact_epsilon_omp)
-     CALL getin('thermals_betalpha',betalpha_omp)
-     CALL getin('thermals_afact',afact_omp)
-     CALL getin('thermals_fact_shell',fact_shell_omp)
-     CALL getin('thermals_detr_min',detr_min_omp)
-     CALL getin('thermals_entr_min',entr_min_omp)
-     CALL getin('thermals_detr_q_coef',detr_q_coef_omp)
-     CALL getin('thermals_detr_q_power',detr_q_power_omp)
-     CALL getin('thermals_mix0',mix0_omp)
-     CALL getin('thermals_flag_alim',thermals_flag_alim_omp)
-!    CALL getin('thermals_X',X_omp)
-!    X=X_omp
-     !$OMP END MASTER
-     !$OMP BARRIER
-     fact_epsilon=fact_epsilon_omp
-     betalpha=betalpha_omp
-     afact=afact_omp
-     fact_shell=fact_shell_omp
-     detr_min=detr_min_omp
-     entr_min=entr_min_omp
-     detr_q_coef=detr_q_coef_omp
-     detr_q_power=detr_q_power_omp
-     mix0=mix0_omp
-     thermals_flag_alim=thermals_flag_alim_omp
+
+     CALL getin_p('thermals_fact_epsilon',fact_epsilon)
+     CALL getin_p('thermals_betalpha',betalpha)
+     CALL getin_p('thermals_afact',afact)
+     CALL getin_p('thermals_fact_shell',fact_shell)
+     CALL getin_p('thermals_detr_min',detr_min)
+     CALL getin_p('thermals_entr_min',entr_min)
+     CALL getin_p('thermals_detr_q_coef',detr_q_coef)
+     CALL getin_p('thermals_detr_q_power',detr_q_power)
+     CALL getin_p('thermals_mix0',mix0)
+     CALL getin_p('thermals_flag_alim',thermals_flag_alim)
+
 
       first=.false.