Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • LMDZ6/trunk/libf/phylmd/thermcell_plume.F90

    r2406 r3036  
    1212!--------------------------------------------------------------------------
    1313USE IOIPSL, ONLY : getin
     14USE ioipsl_getin_p_mod, ONLY : getin_p
    1415
    1516       USE print_control_mod, ONLY: prt_level
     
    9697      REAL fact_gamma,fact_gamma2,fact_epsilon2
    9798
    98       REAL, SAVE :: fact_epsilon, fact_epsilon_omp=0.002
    99       REAL, SAVE :: betalpha, betalpha_omp=0.9
    100       REAL, SAVE :: afact, afact_omp=2./3.
    101       REAL, SAVE :: fact_shell, fact_shell_omp=1.
    102       REAL,SAVE :: detr_min,detr_min_omp=1.e-5
    103       REAL,SAVE :: entr_min,entr_min_omp=1.e-5
    104       REAL,SAVE :: detr_q_coef,detr_q_coef_omp=0.012
    105       REAL,SAVE :: detr_q_power,detr_q_power_omp=0.5
    106       REAL,SAVE :: mix0,mix0_omp=0.
    107       INTEGER,SAVE :: thermals_flag_alim,thermals_flag_alim_omp=0
     99      REAL, SAVE :: fact_epsilon=0.002
     100      REAL, SAVE :: betalpha=0.9
     101      REAL, SAVE :: afact=2./3.
     102      REAL, SAVE :: fact_shell=1.
     103      REAL,SAVE :: detr_min=1.e-5
     104      REAL,SAVE :: entr_min=1.e-5
     105      REAL,SAVE :: detr_q_coef=0.012
     106      REAL,SAVE :: detr_q_power=0.5
     107      REAL,SAVE :: mix0=0.
     108      INTEGER,SAVE :: thermals_flag_alim=0
    108109
    109110!$OMP THREADPRIVATE(fact_epsilon, betalpha, afact, fact_shell)
     
    121122      RLvCp = RLVTT/RCPD
    122123      IF (first) THEN
    123      !$OMP MASTER
    124 ! FH : if ok_sync=.true. , the time axis is written at each time step
    125 ! in the output files. Only at the end in the opposite case
    126      CALL getin('thermals_fact_epsilon',fact_epsilon_omp)
    127      CALL getin('thermals_betalpha',betalpha_omp)
    128      CALL getin('thermals_afact',afact_omp)
    129      CALL getin('thermals_fact_shell',fact_shell_omp)
    130      CALL getin('thermals_detr_min',detr_min_omp)
    131      CALL getin('thermals_entr_min',entr_min_omp)
    132      CALL getin('thermals_detr_q_coef',detr_q_coef_omp)
    133      CALL getin('thermals_detr_q_power',detr_q_power_omp)
    134      CALL getin('thermals_mix0',mix0_omp)
    135      CALL getin('thermals_flag_alim',thermals_flag_alim_omp)
    136 !    CALL getin('thermals_X',X_omp)
    137 !    X=X_omp
    138      !$OMP END MASTER
    139      !$OMP BARRIER
    140      fact_epsilon=fact_epsilon_omp
    141      betalpha=betalpha_omp
    142      afact=afact_omp
    143      fact_shell=fact_shell_omp
    144      detr_min=detr_min_omp
    145      entr_min=entr_min_omp
    146      detr_q_coef=detr_q_coef_omp
    147      detr_q_power=detr_q_power_omp
    148      mix0=mix0_omp
    149      thermals_flag_alim=thermals_flag_alim_omp
     124
     125     CALL getin_p('thermals_fact_epsilon',fact_epsilon)
     126     CALL getin_p('thermals_betalpha',betalpha)
     127     CALL getin_p('thermals_afact',afact)
     128     CALL getin_p('thermals_fact_shell',fact_shell)
     129     CALL getin_p('thermals_detr_min',detr_min)
     130     CALL getin_p('thermals_entr_min',entr_min)
     131     CALL getin_p('thermals_detr_q_coef',detr_q_coef)
     132     CALL getin_p('thermals_detr_q_power',detr_q_power)
     133     CALL getin_p('thermals_mix0',mix0)
     134     CALL getin_p('thermals_flag_alim',thermals_flag_alim)
     135
    150136
    151137      first=.false.
Note: See TracChangeset for help on using the changeset viewer.