Changeset 3831 for dynamico_lmdz


Ignore:
Timestamp:
Jun 18, 2015, 12:00:37 PM (10 years ago)
Author:
ymipsl
Message:

module reorganisation for a cleaner dyn-phys interface
YM

Location:
dynamico_lmdz/aquaplanet/LMDZ5/libf
Files:
4 added
2 deleted
76 edited

Legend:

Unmodified
Added
Removed

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/dyn3d/gcm.F90

    r3828 r3831  
    442442#ifdef CPP_PHYS
    443443     CALL iniphysiq(iim,jjm,(jjm-1)*iim+2-1/iim,comm_lmdz, &
    444           llm,daysec,day_ini,dtphys/nsplit_phys, &
     444          llm,daysec, dtphys/nsplit_phys, &
    445445          rlatu,rlatv,rlonu,rlonv,aire,cu,cv,rad,g,r,cpp, &
    446446          iflag_phys)

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/dyn3dpar/gcm.F

    r3822 r3831  
    430430! Physics:
    431431#ifdef CPP_PHYS
    432          CALL iniphysiq(iim,jjm,llm,daysec,day_ini,dtphys/nsplit_phys,
     432         CALL iniphysiq(iim,jjm,llm,daysec,dtphys/nsplit_phys,
    433433     &                rlatu,rlatv,rlonu,rlonv,aire,cu,cv,rad,g,r,cpp,
    434434     &                iflag_phys)

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/dynlonlat_phylonlat/phylmd/iniphysiq.F90

    r3828 r3831  
    2020                      niadv,conv_flg,pbl_flg,solsym
    2121  USE control_mod, ONLY: dayref,anneeref,day_step,iphysiq,nday,&
    22                          config_inca,raz_date,offline
     22                         raz_date,offline
    2323  USE inifis_mod, ONLY: inifis
     24  USE time_phylmdz_mod, ONLY: init_time
    2425  USE infotrac_phy, ONLY: init_infotrac_phy
    2526  USE phyaqua_mod, ONLY: iniaqua
    … …  
    8889  REAL,ALLOCATABLE,SAVE :: boundslatfi(:,:)
    8990!$OMP THREADPRIVATE (latfi,lonfi,cufi,cvfi,airefi,boundslonfi,boundslatfi)
     91  INTEGER :: itaufin_phy
     92 
    9093
    9194  CALL init_physics_distribution(regular_lonlat, 4, nbp, ii, jj+1, nlayer, communicator)
    … …  
    233236
    234237  ! transfer some flags/infos from dynamics to physics
    235   call inifis(punjours,prad,pg,pr,pcpp,ptimestep,&
    236               day_step,iphysiq,dayref,anneeref,nday,&
    237               annee_ref,day_ini,day_end,&
    238               itau_phy,itaufin,&
    239               start_time,day_ref,jD_ref, &
    240               offline,raz_date,config_inca, &
    241               lunout,prt_level,debug)
     238 
     239  itaufin_phy=itaufin/iphysiq
     240
     241  CALL inifis(punjours,prad,pg,pr,pcpp)
     242
     243  CALL init_time(annee_ref, day_ref, day_ini, start_time, nday, ptimestep)
    242244 
    243245  ! Additional initializations for aquaplanets

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/abort_physic.F90

    r3817 r3831  
    88#endif
    99      USE mod_phys_lmdz_para
    10       USE inifis_mod, ONLY: lunout
     10      USE print_control_mod, ONLY: lunout
    1111 
    1212!

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/add_phys_tend.F90

    r3828 r3831  
    1717use phys_local_var_mod
    1818use phys_state_var_mod
    19 USE inifis_mod, ONLY: prt_level
     19USE print_control_mod, ONLY: prt_level
    2020USE geometry_mod, ONLY : lon_degrees, lat_degrees
    2121IMPLICIT none

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/calbeta_clim.F90

    r3817 r3831  
    1414
    1515  USE phys_cal_mod, only: year_len
    16   USE inifis_mod, ONLY: prt_level
     16  USE print_control_mod, ONLY: prt_level
    1717
    1818  implicit none

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/calltherm.F90

    r3818 r3831  
    2121      USE dimphy
    2222      USE indice_sol_mod
    23       USE inifis_mod, ONLY: lunout, prt_level
     23      USE print_control_mod, ONLY: lunout, prt_level
    2424
    2525      implicit none

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/carbon_cycle_mod.F90

    r3825 r3831  
    9292    USE surface_data, ONLY : ok_veget, type_ocean
    9393    USE phys_cal_mod, ONLY : mth_len
    94     USE inifis_mod, ONLY: lunout
     94    USE print_control_mod, ONLY: lunout
    9595
    9696    IMPLICIT NONE
    … …  
    309309    USE phys_cal_mod, ONLY : day_cur
    310310    USE indice_sol_mod
    311     USE inifis_mod, ONLY: lunout
     311    USE print_control_mod, ONLY: lunout
    312312    USE geometry_mod, ONLY : cell_area
    313313

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cdrag.F90

    r3817 r3831  
    99  USE dimphy
    1010  USE indice_sol_mod
    11   USE inifis_mod, ONLY: lunout
     11  USE print_control_mod, ONLY: lunout
    1212  IMPLICIT NONE
    1313! ================================================================= c

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/change_srf_frac_mod.F90

    r3817 r3831  
    3333    USE ocean_slab_mod, ONLY : fsic, ocean_slab_frac
    3434    USE indice_sol_mod
    35     USE inifis_mod, ONLY: lunout
     35    USE print_control_mod, ONLY: lunout
    3636
    3737    INCLUDE "YOMCST.h"

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/coef_diff_turb_mod.F90

    r3817 r3831  
    1818    USE dimphy
    1919    USE indice_sol_mod
    20     USE inifis_mod, ONLY: prt_level, lunout
     20    USE print_control_mod, ONLY: prt_level, lunout
    2121!
    2222! Calculate coefficients(ycoefm, ycoefh) for turbulent diffusion in the
    … …  
    188188    USE dimphy
    189189    USE indice_sol_mod
    190     USE inifis_mod, ONLY: lunout, prt_level
     190    USE print_control_mod, ONLY: lunout, prt_level
    191191 
    192192!======================================================================

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/concvl.F90

    r3818 r3831  
    3131  USE infotrac_phy, ONLY: nbtr
    3232  USE phys_local_var_mod, ONLY: omega
    33   USE inifis_mod, ONLY: lunout, prt_level
     33  USE print_control_mod, ONLY: lunout, prt_level
    3434  IMPLICIT NONE
    3535! ======================================================================

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/condsurf.F90

    r3816 r3831  
    77  USE indice_sol_mod
    88  !USE temps_phy_mod
    9   USE inifis_mod, ONLY: annee_ref
     9  USE time_phylmdz_mod, ONLY: annee_ref
    1010  IMPLICIT NONE
    1111

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/conf_phys_m.F90

    r3817 r3831  
    2727    USE phys_cal_mod
    2828    USE carbon_cycle_mod, ONLY : carbon_cycle_tr, carbon_cycle_cpl
    29     !USE control_phy_mod
    3029    USE mod_grid_phy_lmdz, only: klon_glo
    31     USE inifis_mod, ONLY: lunout
    32 
     30    USE print_control_mod, ONLY: lunout
     31    USE time_phylmdz_mod, ONLY: pdtphys
    3332
    3433    include "conema3.h"
    … …  
    15111510    !Config Desc = freq_calNMC(2) = frequence de calcul fichiers histdayNMC
    15121511    !Config Desc = freq_calNMC(3) = frequence de calcul fichiers histhfNMC
    1513     !Config Def  = pasphys
    1514     !Config Help =
    1515     !
    1516     freq_calNMC_omp(1) = pasphys
    1517     freq_calNMC_omp(2) = pasphys
    1518     freq_calNMC_omp(3) = pasphys
     1512    !Config Def  = pdtphys
     1513    !Config Help =
     1514    !
     1515    freq_calNMC_omp(1) = pdtphys
     1516    freq_calNMC_omp(2) = pdtphys
     1517    freq_calNMC_omp(3) = pdtphys
    15191518    call getin('freq_calNMC',freq_calNMC_omp)
    15201519    !
    … …  
    22882287
    22892288  use IOIPSL
    2290   USE inifis_mod, ONLY: lunout
     2289  USE print_control_mod, ONLY: lunout
    22912290  implicit none
    22922291  ! Configuration de l'interace atm/surf

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/conflx.F90

    r3817 r3831  
    992992    pdpmel, ktopm2, pmflxr, pmflxs)
    993993  USE dimphy
    994   USE inifis_mod, ONLY: prt_level
     994  USE print_control_mod, ONLY: prt_level
    995995  IMPLICIT NONE
    996996  ! ----------------------------------------------------------------------

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/control_phy_mod.f90

    r3816 r3831  
    11MODULE control_phy_mod
    22
    3   !INTEGER,SAVE :: iphysiq ! call physics every iphysiq dynamical steps
    4   !$OMP THREADPRIVATE(iphysiq)
    5   ! => ifinis_mod
    63
    7   !INTEGER,SAVE :: day_step ! # of dynamical time steps per day
     4  !INTEGER,SAVE :: day_step ! # of time steps per day
    85  !$OMP THREADPRIVATE(day_step)
    96  ! => inifis_mod

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cosp/cosp_output_write_mod.F90

    r3809 r3831  
    5151
    5252! A refaire
    53        itau_wcosp = itau_phy + itap + start_time * day_step / iphysiq
     53       itau_wcosp = itau_phy + itap + start_time * day_step
    5454        if (prt_level >= 10) then
    55              WRITE(lunout,*)'itau_wcosp, itap, start_time, day_step, iphysiq =', &
    56                              itau_wcosp, itap, start_time, day_step, iphysiq
     55             WRITE(lunout,*)'itau_wcosp, itap, start_time, day_step', &
     56                             itau_wcosp, itap, start_time, day_step
    5757        endif
    5858

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cpl_mod.F90

    r3825 r3831  
    2525  USE write_field_phy
    2626  !USE control_phy_mod
    27   USE inifis_mod, ONLY: day_step, iphysiq
     27  USE time_phylmdz_mod, ONLY: day_step
    2828
    2929 
    … …  
    105105    USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat, grid1dTo2d_glo
    106106   ! USE temps_phy_mod
    107     USE inifis_mod, ONLY: annee_ref, day_ini, itau_phy, itaufin, lunout
     107    USE time_phylmdz_mod, ONLY: annee_ref, day_ini, itau_phy, itaufin
     108    USE print_control_mod, ONLY: lunout
    108109
    109110! Input arguments
    … …  
    131132!*************************************************************************************
    132133     
    133     npas = itaufin/ iphysiq
     134    npas = itaufin
    134135!    nexca = 86400 / dtime
    135136    nexca = t_coupl / dtime
    … …  
    298299    USE indice_sol_mod
    299300  !  USE temps_phy_mod
    300     USE inifis_mod, ONLY: start_time, itau_phy
     301    USE time_phylmdz_mod, ONLY: start_time, itau_phy
    301302    USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
    302303   
    … …  
    345346       IF (is_sequential) THEN
    346347          ndexcs(:) = 0
    347           itau_w = itau_phy + itime + start_time * day_step / iphysiq
     348          itau_w = itau_phy + itime + start_time * day_step
    348349          DO i = 1, maxrecv
    349350            IF (inforecv(i)%action) THEN
    … …  
    10271028    USE indice_sol_mod
    10281029  !  USE temps_phy_mod
    1029     USE inifis_mod, ONLY: start_time, itau_phy
     1030    USE time_phylmdz_mod, ONLY: start_time, itau_phy
    10301031
    10311032! Some includes
    … …  
    12331234    IF (is_sequential) THEN
    12341235       ndexct(:) = 0
    1235        itau_w = itau_phy + itime + start_time * day_step / iphysiq
     1236       itau_w = itau_phy + itime + start_time * day_step
    12361237       CALL histwrite(nidct,'tauxe',itau_w,tmp_taux,nbp_lon*nbp_lat,ndexct)
    12371238       CALL histwrite(nidct,'tauyn',itau_w,tmp_tauy,nbp_lon*nbp_lat,ndexct)

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cv30_routines.F90

    r3817 r3831  
    734734    v, gz, th, tra, h, lv, cpn, p, ph, tv, tp, tvp, clw, sig, w0)
    735735 
    736   USE inifis_mod, ONLY: lunout
     736  USE print_control_mod, ONLY: lunout
    737737  IMPLICIT NONE
    738738

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cv3_inip.F90

    r3817 r3831  
    2929!
    3030!----------------------------------------------
    31   USE inifis_mod, ONLY: prt_level, lunout
     31  USE print_control_mod, ONLY: prt_level, lunout
    3232  IMPLICIT NONE
    3333

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cv3_routines.F90

    r3817 r3831  
    885885                        h, lv, cpn, p, ph, tv, tp, tvp, clw, &
    886886                        sig, w0)
    887   USE inifis_mod, ONLY: lunout
     887  USE print_control_mod, ONLY: lunout
    888888  IMPLICIT NONE
    889889

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cv3p1_closure.F90

    r3817 r3831  
    1818  ! Julie Frohwirth,     14/10/2005  17.44.22  *
    1919  ! **************************************************************
    20   USE inifis_mod, ONLY: prt_level, lunout
     20  USE print_control_mod, ONLY: prt_level, lunout
    2121  IMPLICIT NONE
    2222

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cv_routines.F90

    r3817 r3831  
    396396    tp1, tvp1, clw1, iflag, nk, icb, cbmf, plcl, tnk, qnk, gznk, t, q, qs, u, &
    397397    v, gz, h, lv, cpn, p, ph, tv, tp, tvp, clw, dph)
    398   USE inifis_mod, ONLY: lunout
     398  USE print_control_mod, ONLY: lunout
    399399  IMPLICIT NONE
    400400

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cva_driver.F90

    r3818 r3831  
    3737
    3838  USE dimphy
    39   USE inifis_mod, ONLY: lunout, prt_level
     39  USE print_control_mod, ONLY: lunout, prt_level
    4040  IMPLICIT NONE
    4141

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/fisrtilp.F90

    r3817 r3831  
    1313  !
    1414  USE dimphy
    15   USE inifis_mod, ONLY: prt_level, lunout
     15  USE print_control_mod, ONLY: prt_level, lunout
    1616  USE icefrac_lsc_mod ! compute ice fraction (JBM 3/14)
    1717  IMPLICIT none

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/fisrtilp_tr.F90

    r3817 r3831  
    1010
    1111  USE dimphy
    12   USE inifis_mod, ONLY: lunout
     12  USE print_control_mod, ONLY: lunout
    1313  IMPLICIT NONE
    1414  ! ======================================================================

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/hgardfou.F90

    r3825 r3831  
    55  USE phys_state_var_mod
    66  USE indice_sol_mod
    7   USE inifis_mod, ONLY: lunout
     7  USE print_control_mod, ONLY: lunout
    88  USE geometry_mod, ONLY : lon_degrees, lat_degrees
    99  IMPLICIT NONE

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/ini_wake.F90

    r3817 r3831  
    44SUBROUTINE ini_wake(wape, fip, it_wape_prescr, wape_prescr, fip_prescr, &
    55    alp_bl_prescr, ale_bl_prescr)
    6   USE inifis_mod, ONLY: lunout
     6  USE print_control_mod, ONLY: lunout
    77  IMPLICIT NONE
    88  ! **************************************************************

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/inifis_mod.F90

    r3826 r3831  
    55  IMPLICIT NONE
    66  ! for now constants and flags transmitted from dyn to phys are stored here
    7   REAL,SAVE :: daysec ! length of reference day (s)
    8   REAL,SAVE :: dtphys ! physics time step (s)
    9   INTEGER,SAVE :: day_step ! number of dynamical steps per day
    10   INTEGER,SAVE :: iphysiq ! physics called every iphysiq dynamical step
    11   INTEGER,SAVE :: dayref
    12   INTEGER,SAVE :: anneeref ! reference year, ase deifined in run.def
    13   INTEGER,SAVE :: nday ! number of days to run
    14 !$OMP THREADPRIVATE(daysec,dtphys,day_step,iphysiq,dayref,anneeref,nday)
    15   INTEGER,SAVE :: annee_ref ! reference year as read from start file
    16   INTEGER,SAVE :: day_ini
    17   INTEGER,SAVE :: day_end
    18 !$OMP THREADPRIVATE(annee_ref,day_ini,day_end)
    19   INTEGER,SAVE :: itau_phy
    20   INTEGER,SAVE :: itaufin
    21   REAL,SAVE :: start_time
    22   INTEGER,SAVE :: day_ref
    23   REAL,SAVE :: jD_ref
    24 !$OMP THREADPRIVATE(itau_phy,itaufin,start_time,day_ref,JD_ref)
    25   LOGICAL,SAVE :: offline
    26   INTEGER,SAVE :: raz_date
    27   CHARACTER(len=4),SAVE :: config_inca
    28   INTEGER,SAVE :: lunout=6 ! default output file identifier (6==screen)
    29   INTEGER,SAVE :: prt_level ! Output level
    30   LOGICAL,SAVE :: debug ! flag to specify if in "debug mode"
    31 !$OMP THREADPRIVATE(offline,raz_date,config_inca,lunout,prt_level,debug)
     7!  REAL,SAVE    :: daysec ! length of reference day (s)
     8!  REAL,SAVE    :: dtphys ! physics time step (s)
     9!  INTEGER,SAVE :: day_step ! number of physical steps per day
     10!  INTEGER,SAVE :: nday ! number of days to run
     11!!$OMP THREADPRIVATE(daysec,dtphys,day_step,iphysiq,dayref,anneeref,nday)
     12!  INTEGER,SAVE :: annee_ref ! reference year as read from start file
     13!  INTEGER,SAVE :: day_ini
     14!  INTEGER,SAVE :: day_end
     15!!$OMP THREADPRIVATE(annee_ref,day_ini,day_end)
     16!  INTEGER,SAVE :: itau_phy   ! number of physiq iteration from origin
     17!  INTEGER,SAVE :: itaufin    ! final iteration
     18!  REAL,SAVE    :: start_time
     19!  INTEGER,SAVE :: day_ref
     20!  REAL,SAVE :: jD_ref
     21!!$OMP THREADPRIVATE(itau_phy,itaufin,start_time,day_ref,JD_ref)
     22!  INTEGER,SAVE :: raz_date
     23!  INTEGER,SAVE :: lunout=6 ! default output file identifier (6==screen)
     24!  INTEGER,SAVE :: prt_level ! Output level
     25!  LOGICAL,SAVE :: debug ! flag to specify if in "debug mode"
     26!!$OMP THREADPRIVATE(lunout,prt_level,debug)
    3227
    3328CONTAINS
    3429
    35   SUBROUTINE inifis(punjours,prad,pg,pr,pcpp,ptimestep,&
    36                     day_step_dyn,iphysiq_dyn,&
    37                     dayref_dyn,anneeref_dyn,nday_dyn,&
    38                     annee_ref_dyn,day_ini_dyn,day_end_dyn,&
    39                     itau_phy_dyn,itaufin_dyn,&
    40                     start_time_dyn,day_ref_dyn,jD_ref_dyn,&
    41                     offline_dyn,raz_date_dyn,config_inca_dyn, &
    42                     lunout_dyn,prt_level_dyn,debug_dyn)
     30  SUBROUTINE inifis(punjours, prad,pg,pr,pcpp)
    4331  ! Initialize physics constant and flags from dynamics
     32  USE init_print_control_mod, ONLY : init_print_control
     33  USE print_control_mod, ONLY : lunout
     34  USE phystokenc_mod, only: init_phystokenc
    4435  IMPLICIT NONE
    4536
    4637  include "YOMCST.h"
    47   REAL,INTENT(IN) :: punjours,prad, pg, pr, pcpp
    48   REAL,INTENT(IN) :: ptimestep ! physics time step (s)
    49   INTEGER,INTENT(IN) :: day_step_dyn
    50   INTEGER,INTENT(IN) :: iphysiq_dyn
    51   INTEGER,INTENT(IN) :: dayref_dyn
    52   INTEGER,INTENT(IN) :: anneeref_dyn
    53   INTEGER,INTENT(IN) :: nday_dyn
    54   INTEGER,INTENT(IN) :: annee_ref_dyn
    55   INTEGER,INTENT(IN) :: day_ini_dyn
    56   INTEGER,INTENT(IN) :: day_end_dyn
    57   INTEGER,INTENT(IN) :: itau_phy_dyn
    58   INTEGER,INTENT(IN) :: itaufin_dyn
    59   REAL,INTENT(IN) :: start_time_dyn
    60   INTEGER,INTENT(IN) :: day_ref_dyn
    61   REAL,INTENT(IN) :: jD_ref_dyn
    62   LOGICAL,INTENT(IN) :: offline_dyn
    63   INTEGER,INTENT(IN) :: raz_date_dyn
    64   CHARACTER(len=4),INTENT(IN) :: config_inca_dyn
    65   INTEGER,INTENT(IN) :: lunout_dyn
    66   INTEGER,INTENT(IN) :: prt_level_dyn
    67   LOGICAL,INTENT(IN) :: debug_dyn
     38  REAL,INTENT(IN) :: punjours, prad, pg, pr, pcpp
    6839  CHARACTER (LEN=20) :: modname = 'inifis'
    6940  CHARACTER (LEN=80) :: abort_message
    7041
    71   ! Some general settings and associated flags
    72   daysec=punjours
    73   dtphys=ptimestep
    74   day_step=day_step_dyn
    75   iphysiq=iphysiq_dyn
    76   dayref=dayref_dyn
    77   anneeref=anneeref_dyn
    78   nday=nday_dyn
    79   annee_ref=annee_ref_dyn
    80   day_ini=day_ini_dyn
    81   day_end=day_end_dyn
    82   itau_phy=itau_phy_dyn
    83   itaufin=itaufin_dyn
    84   start_time=start_time_dyn
    85   day_ref=day_ref_dyn
    86   jD_ref= jD_ref_dyn
    87   offline=offline_dyn
    88   raz_date=raz_date_dyn
    89   config_inca=config_inca_dyn
    90   lunout=lunout_dyn
    91   prt_level=prt_level_dyn
    92   debug=debug_dyn
     42  CALL init_print_control
    9343
    9444  ! suphel => initialize some physical constants (orbital parameters,
    … …  
    14999    END IF
    150100  END IF
     101 
     102  CALL init_phystokenc
    151103
    152104  END SUBROUTINE inifis

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/initphysto.F90

    r3818 r3831  
    1212  !USE comconst_phy_mod
    1313  !USE temps_phy_mod
    14   USE inifis_mod, ONLY: day_ref, annee_ref
     14  USE time_phylmdz_mod, ONLY: day_ref, annee_ref
    1515  USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, nbp_lev
    1616 

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/iophy.F90

    r3828 r3831  
    614614    use ioipsl, only: getin
    615615    use phys_output_var_mod, only: nfiles
    616     use inifis_mod, only: prt_level, lunout
     616    use print_control_mod, only: prt_level, lunout
    617617    IMPLICIT NONE
    618618
    … …  
    635635                                jj_nb, klon_mpi
    636636  USE ioipsl, only: histwrite
    637   USE inifis_mod, ONLY: prt_level, lunout
     637  USE print_control_mod, ONLY: prt_level, lunout
    638638  USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
    639639  IMPLICIT NONE
    … …  
    701701  USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
    702702  use ioipsl, only: histwrite
    703   use inifis_mod, only: prt_level, lunout
     703  use print_control_mod, only: prt_level, lunout
    704704  IMPLICIT NONE
    705705   
    … …  
    778778  USE xios, only: xios_send_field
    779779#endif
    780   USE inifis_mod, ONLY: lunout, prt_level
     780  USE print_control_mod, ONLY: lunout, prt_level
    781781
    782782  IMPLICIT NONE
    … …  
    937937  USE xios, only: xios_send_field
    938938#endif
    939   USE inifis_mod, ONLY: prt_level, lunout
     939  USE print_control_mod, ONLY: prt_level, lunout
    940940
    941941  IMPLICIT NONE

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/minmaxqfi.F90

    r3817 r3831  
    44SUBROUTINE minmaxqfi(zq,qmin,qmax,comment)
    55  USE dimphy
    6   USE inifis_mod, ONLY: prt_level
     6  USE print_control_mod, ONLY: prt_level
    77  IMPLICIT NONE
    88

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/mod_phys_lmdz_mpi_data.F90

    r3827 r3831  
    179179  SUBROUTINE print_module_data
    180180 
    181   USE inifis_mod, ONLY: lunout
     181  USE print_control_mod, ONLY: lunout
    182182  IMPLICIT NONE
    183183 

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/mod_phys_lmdz_omp_data.F90

    r3817 r3831  
    77  INTEGER,SAVE :: omp_rank
    88  LOGICAL,SAVE :: is_omp_root
     9  LOGICAL,SAVE :: is_omp_master  ! alias of is_omp_root
    910  LOGICAL,SAVE :: is_using_omp
    1011 
    … …  
    1617  INTEGER,SAVE :: klon_omp_begin
    1718  INTEGER,SAVE :: klon_omp_end
    18 !$OMP  THREADPRIVATE(omp_rank,klon_omp,is_omp_root,klon_omp_begin,klon_omp_end)
     19!$OMP  THREADPRIVATE(omp_rank,klon_omp,is_omp_root,is_omp_master,klon_omp_begin,klon_omp_end)
    1920
    2021CONTAINS
    … …  
    5960   ENDIF
    6061!$OMP END MASTER
    61 
     62   is_omp_master=is_omp_root
    6263
    6364!$OMP MASTER
    … …  
    9091
    9192  SUBROUTINE Print_module_data
    92   USE inifis_mod, ONLY: lunout
     93  USE print_control_mod, ONLY: lunout
    9394  IMPLICIT NONE
    9495

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/mod_phys_lmdz_para.F90

    r3825 r3831  
    4646  SUBROUTINE Test_transfert
    4747  USE mod_grid_phy_lmdz
    48   USE inifis_mod, ONLY: lunout
     48  USE print_control_mod, ONLY: lunout
    4949  IMPLICIT NONE
    5050 

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/pbl_surface_mod.F90

    r3819 r3831  
    4949
    5050    USE indice_sol_mod
    51     USE inifis_mod, ONLY: lunout
     51    USE print_control_mod, ONLY: lunout
    5252    IMPLICIT NONE
    5353    INCLUDE "dimsoil.h"
    … …  
    261261    USE carbon_cycle_mod, ONLY : carbon_cycle_cpl, co2_send
    262262    USE indice_sol_mod
    263   !  USE temps_phy_mod
    264     USE inifis_mod, ONLY: annee_ref, day_ini, itau_phy, lunout, prt_level
     263    USE time_phylmdz_mod, ONLY: annee_ref, day_ini, itau_phy
     264    USE print_control_mod, ONLY: lunout, prt_level
    265265    USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, grid1dto2d_glo
    266266    IMPLICIT NONE

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phyaqua_mod.F90

    r3825 r3831  
    2525    USE fonte_neige_mod, ONLY: fonte_neige_init
    2626    USE phys_state_var_mod
    27     USE inifis_mod, ONLY: dayref, nday, iphysiq, dtphys, &
    28                           daysec, day_ini,day_end
     27    USE time_phylmdz_mod, ONLY: day_ref, ndays, pdtphys, &
     28                                day_ini,day_end
    2929    USE indice_sol_mod
    3030    USE nrtype, ONLY: pi
    … …  
    3434    include "clesphys.h"
    3535    include "dimsoil.h"
     36    include "YOMCST.h"
    3637
    3738    INTEGER, INTENT (IN) :: nlon, iflag_phys
    … …  
    141142    ! -----------------------------------------------------------------------
    142143
    143     day_ini = dayref
    144     day_end = day_ini + nday
     144    day_ini = day_ref
     145    day_end = day_ini + ndays
    145146
    146147    !$OMP MASTER
    … …  
    254255    ! Ecriture etat initial physique
    255256
    256     timestep = dtphys
    257     radpas = nint(daysec/timestep/float(nbapp_rad))
     257    timestep = pdtphys
     258    radpas = nint(rday/timestep/float(nbapp_rad))
    258259
    259260    DO i = 1, longcles

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phyetat0.F90

    r3828 r3831  
    2727  USE indice_sol_mod, only: nbsrf, is_ter, epsfra, is_lic, is_oce, is_sic
    2828  USE ocean_slab_mod, ONLY: tslab, seaice, tice, ocean_slab_init
    29   !USE temps_phy_mod
    30   USE inifis_mod, ONLY: itau_phy
     29  USE time_phylmdz_mod, ONLY: init_iteration, pdtphys, itau_phy
    3130
    3231  IMPLICIT none
    … …  
    103102  ENDDO
    104103
    105   tab_cntrl(1)=dtime
     104  tab_cntrl(1)=pdtphys
    106105  tab_cntrl(2)=radpas
    107106
    … …  
    138137  clesphy0(8)=tab_cntrl( 12 )
    139138
     139  ! set time iteration
     140   CALL init_iteration(itau_phy)
     141   
    140142  ! Sanity check on longitudes
    141143  CALL get_field("longitude",lon_startphy)
    … …  
    895897USE iostart, ONLY : get_field
    896898USE dimphy, only: klon
    897 USE inifis_mod, ONLY: lunout
     899USE print_control_mod, ONLY: lunout
    898900
    899901IMPLICIT NONE
    … …  
    934936USE dimphy, only: klon
    935937USE indice_sol_mod, only: nbsrf
    936 USE inifis_mod, ONLY: lunout
     938USE print_control_mod, ONLY: lunout
    937939
    938940IMPLICIT NONE

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phyredem.F90

    r3825 r3831  
    1818  USE surface_data
    1919  USE ocean_slab_mod, ONLY : tslab, seaice, tice, fsic
    20   !USE temps_phy_mod
    21   USE inifis_mod, ONLY: annee_ref, day_end, itau_phy
     20  USE time_phylmdz_mod, ONLY: annee_ref, day_end, itau_phy
    2221
    2322  IMPLICIT none

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phys_cal_mod.F90

    r3809 r3831  
    1010  INTEGER :: days_elapsed  ! number of whole days since start of the simulation
    1111  INTEGER :: mth_len       ! number of days in the current month
    12   INTEGER year_len ! number of days in the current year
     12  INTEGER :: year_len      ! number of days in the current year
    1313  REAL    :: hour
    1414  REAL    :: jD_1jan
    1515  REAL    :: jH_1jan
    1616  REAL    :: xjour
     17  REAL    :: jD_cur  ! jour courant a l'appel de la physique (jour julien)
     18  REAL    :: jH_cur  ! heure courante a l'appel de la physique (jour julien)
     19  REAL    :: jD_ref  ! jour du demarage de la simulation (jour julien)
    1720
    1821
    1922CONTAINS
    2023 
    21   SUBROUTINE phys_cal_update(jD_cur, jH_cur)
     24  SUBROUTINE phys_cal_init(annee_ref,day_ref)
     25  USE IOIPSL, ONLY:  ymds2ju
     26  IMPLICIT NONE
     27    INTEGER,INTENT(IN) :: annee_ref
     28    INTEGER,INTENT(IN) :: day_ref
     29
     30    CALL ymds2ju(annee_ref, 1, day_ref, 0., jD_ref)
     31    jD_ref=INT(jD_ref)
     32 
     33  END SUBROUTINE  phys_cal_init
     34 
     35 
     36  SUBROUTINE phys_cal_update(julian_day)
    2237    ! This subroutine updates the module saved variables.
     38    USE IOIPSL, only: ju2ymds, ymds2ju, ioget_mon_len, ioget_year_len
     39    REAL, INTENT(IN) :: julian_day
    2340
    24     USE IOIPSL, only: ju2ymds, ymds2ju, ioget_mon_len, ioget_year_len
    25    
    26     REAL, INTENT(IN) :: jD_cur ! jour courant a l'appel de la physique (jour julien)
    27     REAL, INTENT(IN) :: jH_cur ! heure courante a l'appel de la physique (jour julien)
     41
     42    jD_cur=INT(julian_day)
     43    jH_cur=julian_day-jD_cur
    2844   
    2945    CALL ju2ymds(jD_cur+jH_cur, year_cur, mth_cur, day_cur, hour)

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phys_output_mod.F90

    r3825 r3831  
    4646    USE phys_output_ctrlout_mod
    4747    USE mod_grid_phy_lmdz, only: klon_glo
    48     !USE temps_phy_mod
    4948    USE vertical_layers_mod,ONLY: ap,bp,presnivs,preff
    50     !Use comvert_phy_mod
    51     USE inifis_mod, ONLY: day_ini, itau_phy, start_time, annee_ref, day_ref
     49    USE time_phylmdz_mod, ONLY: day_ini, itau_phy, start_time, annee_ref, day_ref
    5250#ifdef CPP_XIOS
    5351    ! ug Pour les sorties XIOS
    5452    USE wxios
    5553#endif
    56     USE inifis_mod, ONLY: prt_level, lunout
     54    USE print_control_mod, ONLY: prt_level, lunout
    5755   
    5856    IMPLICIT NONE
    … …  
    524522    use ioipsl
    525523    USE phys_cal_mod
    526     !USE comconst_phy_mod
    527     !USE temps_phy_mod
    528     USE inifis_mod, ONLY: day_ref, annee_ref, lunout
     524    USE time_phylmdz_mod, ONLY: day_ref, annee_ref
     525    USE print_control_mod, ONLY: lunout
    529526    IMPLICIT NONE
    530527

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phys_output_write_mod.F90

    r3825 r3831  
    2626    USE dimphy, only: klon, klev, klevp1, nslay
    2727    USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
    28     !USE control_phy_mod, only: day_step, iphysiq
    29     USE inifis_mod, only: day_step, iphysiq
     28    USE time_phylmdz_mod, only: day_step
    3029    USE phys_output_ctrlout_mod, only: o_phis, o_aire, is_ter, is_lic, is_oce, &
    3130         is_ave, is_sic, o_contfracATM, o_contfracOR, &
    … …  
    250249    USE phys_cal_mod, only : mth_len
    251250    !USE temps_phy_mod
    252     USE inifis_mod, ONLY: start_time, itau_phy
     251    USE time_phylmdz_mod, ONLY: start_time, itau_phy
    253252
    254253    IMPLICIT NONE
    … …  
    293292
    294293    ! On calcul le nouveau tau:
    295     itau_w = itau_phy + itap + start_time * day_step / iphysiq
     294    itau_w = itau_phy + itap + start_time * day_step
    296295    ! On le donne à iophy pour que les histwrite y aient accès:
    297296    CALL set_itau_iophy(itau_w)

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/physiq.F90

    r3825 r3831  
    33
    44SUBROUTINE physiq (nlon,nlev, &
    5      debut,lafin,jD_cur, jH_cur,pdtphys, &
     5     debut,lafin,pdtphys_, &
    66     paprs,pplay,pphi,pphis,presnivs, &
    77     u,v,t,qx, &
    … …  
    1313  USE geometry_mod, ONLY: cell_area
    1414  USE phys_cal_mod, only: year_len, mth_len, days_elapsed, jh_1jan, year_cur, &
    15        mth_cur, phys_cal_update
     15       mth_cur, jD_cur, jH_cur, jD_ref
    1616  USE write_field_phy
    1717  USE dimphy
    … …  
    1919  USE mod_phys_lmdz_para
    2020  USE iophy
    21   USE inifis_mod, ONLY: mydebug=>debug
     21  USE print_control_mod, ONLY: mydebug=>debug
    2222  USE vampir
    2323  USE pbl_surface_mod, ONLY : pbl_surface
    … …  
    4545  use radlwsw_m, only: radlwsw
    4646  use phyaqua_mod, only: zenang_an
    47   !USE control_phy_mod
    48   !USE temps_phy_mod
    49   USE inifis_mod, only: config_inca,day_step,iphysiq,offline,raz_date, &
    50                         annee_ref, day_ref, itau_phy, jD_ref, start_time, &
    51                         prt_level, lunout
     47  USE print_control_mod, only:  prt_level, lunout
     48  USE phystokenc_mod, only: offline, phystokenc
     49  USE time_phylmdz_mod, only: day_step,annee_ref, day_ref, itau_phy, start_time, &
     50                              set_timestep, pdtphys
     51  USE tracinca_mod, ONLY : config_inca                   
    5252  USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, nbp_lev, grid1dTo2d_glo, klon_glo
    5353#ifdef REPROBUS
    … …  
    8888  !! debut---input-L-variable logique indiquant le premier passage
    8989  !! lafin---input-L-variable logique indiquant le dernier passage
    90   !! jD_cur       -R-jour courant a l'appel de la physique (jour julien)
    91   !! jH_cur       -R-heure courante a l'appel de la physique (jour julien)
    92   !! pdtphys-input-R-pas d'integration pour la physique (seconde)
     90  !! pdtphys_input-R-pas d'integration pour la physique (seconde)
    9391  !! paprs---input-R-pression pour chaque inter-couche (en Pa)
    9492  !! pplay---input-R-pression pour le mileu de chaque couche (en Pa)
    … …  
    214212  INTEGER nlon
    215213  INTEGER nlev
    216   REAL, intent(in):: jD_cur, jH_cur
    217 
    218   REAL pdtphys
     214
     215  REAL pdtphys_
    219216  LOGICAL debut, lafin
    220217  REAL paprs(klon,klev+1)
    … …  
    874871 
    875872  !======================================================================
    876   ! Gestion calendrier : mise a jour du module phys_cal_mod
    877   !
    878   CALL phys_cal_update(jD_cur,jH_cur)
     873  ! Gestion calendrier : nouveau pas de temps,
     874  !                      mise a jour du module phys_cal_mod
     875  !
     876  CALL set_timestep(pdtphys_)
    879877
    880878  !======================================================================
    … …  
    912910     call phys_local_var_init
    913911     !
    914      pasphys=pdtphys
    915912     !     appel a la lecture du run.def physique
    916913     call conf_phys(ok_journe, ok_mensuel, &
    … …  
    10551052     ! Il se peut qu'il faille prendre une valeur differente de nbapp_rad
    10561053     ! pour obtenir le meme resultat.
    1057      dtime=pdtphys
    1058      radpas = NINT( 86400./dtime/nbapp_rad)
     1054     radpas = NINT( 86400./pdtphys/nbapp_rad)
    10591055!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    10601056
    … …  
    10711067
    10721068
    1073 
    1074 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    1075      !
    1076      ! on remet le calendrier a zero
    1077      !
    1078      IF (raz_date .eq. 1) THEN
    1079         itau_phy = 0
    1080      ENDIF
    1081 
    10821069     !IM cf. AM 081204 BEG
    10831070     PRINT*,'cycle_diurne3 =',cycle_diurne
    … …  
    10871074          ok_instan, ok_region )
    10881075     !
    1089      IF (ABS(dtime-pdtphys).GT.0.001) THEN
    1090         WRITE(lunout,*) 'Pas physique n est pas correct',dtime, &
    1091              pdtphys
    1092         abort_message='Pas physique n est pas correct '
    1093 
    1094         dtime=pdtphys
    1095      ENDIF
    10961076     IF (nlon .NE. klon) THEN
    10971077        WRITE(lunout,*)'nlon et klon ne sont pas coherents', nlon,  &
    … …  
    11071087     ENDIF
    11081088     !
    1109      IF (dtime*REAL(radpas).GT.21600..AND.cycle_diurne) THEN
     1089     IF (pdtphys*REAL(radpas).GT.21600..AND.cycle_diurne) THEN
    11101090        WRITE(lunout,*)'Nbre d appels au rayonnement insuffisant'
    11111091        WRITE(lunout,*)"Au minimum 4 appels par jour si cycle diurne"
    … …  
    12361216     !
    12371217     !
    1238      lmt_pas = NINT(86400./dtime * 1.0)   ! tous les jours
     1218     lmt_pas = NINT(86400./pdtphys * 1.0)   ! tous les jours
    12391219     WRITE(lunout,*)'La frequence de lecture surface est de ',  &
    12401220          lmt_pas
    … …  
    12621242     call phys_output_open(lon_degrees,lat_degrees,nCFMIP,tabijGCM, &
    12631243          iGCM,jGCM,lonGCM,latGCM, &
    1264           jjmp1,nlevSTD,clevSTD,rlevSTD, dtime,ok_veget, &
     1244          jjmp1,nlevSTD,clevSTD,rlevSTD, pdtphys,ok_veget, &
    12651245          type_ocean,iflag_pbl,iflag_pbl_split,ok_mensuel,ok_journe, &
    12661246          ok_hf,ok_instan,ok_LES,ok_ade,ok_aie,  &
    … …  
    14151395  ! on the surface fraction.
    14161396  !
    1417   CALL change_srf_frac(itap, dtime, days_elapsed+1,  &
     1397  CALL change_srf_frac(itap, pdtphys, days_elapsed+1,  &
    14181398       pctsrf, fevap, z0m, z0h, agesno,              &
    14191399       falb_dir, falb_dif, ftsol, ustar, u10m, v10m, pbl_tke)
    … …  
    15221502  IF (ip_ebil_phy.ge.1) THEN
    15231503     ztit='after dynamic'
    1524      CALL diagetpq(cell_area,ztit,ip_ebil_phy,1,1,dtime &
     1504     CALL diagetpq(cell_area,ztit,ip_ebil_phy,1,1,pdtphys &
    15251505          , t_seri,q_seri,ql_seri,qs_seri,u_seri,v_seri,paprs,pplay &
    15261506          , d_h_vcol, d_qt, d_qw, d_ql, d_qs, d_ec)
    … …  
    15411521     DO k = 1, klev
    15421522        DO i = 1, klon
    1543            d_u_dyn(i,k) = (u_seri(i,k)-u_ancien(i,k))/dtime
    1544            d_v_dyn(i,k) = (v_seri(i,k)-v_ancien(i,k))/dtime
    1545            d_t_dyn(i,k) = (t_seri(i,k)-t_ancien(i,k))/dtime
    1546            d_q_dyn(i,k) = (q_seri(i,k)-q_ancien(i,k))/dtime
     1523           d_u_dyn(i,k) = (u_seri(i,k)-u_ancien(i,k))/pdtphys
     1524           d_v_dyn(i,k) = (v_seri(i,k)-v_ancien(i,k))/pdtphys
     1525           d_t_dyn(i,k) = (t_seri(i,k)-t_ancien(i,k))/pdtphys
     1526           d_q_dyn(i,k) = (q_seri(i,k)-q_ancien(i,k))/pdtphys
    15471527        ENDDO
    15481528     ENDDO
    … …  
    15531533              DO i = 1, klon
    15541534                 d_tr_dyn(i,k,iq-2)= &
    1555                       (tr_seri(i,k,iq-2)-tr_ancien(i,k,iq-2))/dtime
     1535                      (tr_seri(i,k,iq-2)-tr_ancien(i,k,iq-2))/pdtphys
    15561536                 !         iiq=niadv(iq)
    15571537                 !         print*,i,k," d_tr_dyn",d_tr_dyn(i,k,iq-2),"tra:",iq,tname(iiq)
    … …  
    17261706  IF (ip_ebil_phy.ge.2) THEN
    17271707     ztit='after reevap'
    1728      CALL diagetpq(cell_area,ztit,ip_ebil_phy,2,1,dtime &
     1708     CALL diagetpq(cell_area,ztit,ip_ebil_phy,2,1,pdtphys &
    17291709          , t_seri,q_seri,ql_seri,qs_seri,u_seri,v_seri,paprs,pplay &
    17301710          , d_h_vcol, d_qt, d_qw, d_ql, d_qs, d_ec)
    … …  
    17771757     !  Avec ou sans cycle diurne
    17781758     IF (cycle_diurne) THEN
    1779         zdtime=dtime*REAL(radpas) ! pas de temps du rayonnement (s)
     1759        zdtime=pdtphys*REAL(radpas) ! pas de temps du rayonnement (s)
    17801760        CALL zenang(zlongi,jH_cur,zdtime,lat_degrees,lon_degrees,rmu0,fract)
    17811761     ELSE
    … …  
    18481828
    18491829     CALL pbl_surface(  &
    1850           dtime,     date0,     itap,    days_elapsed+1, &
     1830          pdtphys,     date0,     itap,    days_elapsed+1, &
    18511831          debut,     lafin, &
    18521832          lon_degrees,      lat_degrees,      rugoro,  rmu0,      &
    … …  
    19701950     IF (ip_ebil_phy.ge.2) THEN
    19711951        ztit='after surface_main'
    1972         CALL diagetpq(cell_area,ztit,ip_ebil_phy,2,2,dtime &
     1952        CALL diagetpq(cell_area,ztit,ip_ebil_phy,2,2,pdtphys &
    19731953             , t_seri,q_seri,ql_seri,qs_seri,u_seri,v_seri,paprs,pplay &
    19741954             , d_h_vcol, d_qt, d_qw, d_ql, d_qs, d_ec)
    … …  
    20141994     DO i = 1, klon
    20151995        conv_q(i,k) = d_q_dyn(i,k)  &
    2016              + d_q_vdf(i,k)/dtime
     1996             + d_q_vdf(i,k)/pdtphys
    20171997        conv_t(i,k) = d_t_dyn(i,k)  &
    2018              + d_t_vdf(i,k)/dtime
     1998             + d_t_vdf(i,k)/pdtphys
    20191999     ENDDO
    20202000  ENDDO
    … …  
    20492029     abort_message ='reactiver le call conlmd dans physiq.F'
    20502030     CALL abort_physic (modname,abort_message,1)
    2051      !     CALL conlmd (dtime, paprs, pplay, t_seri, q_seri, conv_q,
     2031     !     CALL conlmd (pdtphys, paprs, pplay, t_seri, q_seri, conv_q,
    20522032     !    .             d_t_con, d_q_con,
    20532033     !    .             rain_con, snow_con, ibas_con, itop_con)
    20542034  ELSE IF (iflag_con.EQ.2) THEN
    2055      CALL conflx(dtime, paprs, pplay, t_seri, q_seri, &
     2035     CALL conflx(pdtphys, paprs, pplay, t_seri, q_seri, &
    20562036          conv_t, conv_q, -evap, omega, &
    20572037          d_t_con, d_q_con, rain_con, snow_con, &
    … …  
    22402220        !c          CALL concvl (iflag_con,iflag_clos,
    22412221        CALL concvl (iflag_clos, &
    2242              dtime,paprs,pplay,t_undi,q_undi, &
     2222             pdtphys,paprs,pplay,t_undi,q_undi, &
    22432223             t_wake,q_wake,wake_s, &
    22442224             u_seri,v_seri,tr_seri,nbtr_tmp, &
    … …  
    22752255
    22762256        ! MAF conema3 ne contient pas les traceurs
    2277         CALL conema3 (dtime, &
     2257        CALL conema3 (pdtphys, &
    22782258             paprs,pplay,t_seri,q_seri, &
    22792259             u_seri,v_seri,tr_seri,ntra, &
    … …  
    23732353  IF (ip_ebil_phy.ge.2) THEN
    23742354     ztit='after convect'
    2375      CALL diagetpq(cell_area,ztit,ip_ebil_phy,2,2,dtime &
     2355     CALL diagetpq(cell_area,ztit,ip_ebil_phy,2,2,pdtphys &
    23762356          , t_seri,q_seri,ql_seri,qs_seri,u_seri,v_seri,paprs,pplay &
    23772357          , d_h_vcol, d_qt, d_qw, d_ql, d_qs, d_ec)
    … …  
    23932373             snow_con(i))*cell_area(i)/REAL(klon)
    23942374     ENDDO
    2395      zx_t = zx_t/za*dtime
     2375     zx_t = zx_t/za*pdtphys
    23962376     WRITE(lunout,*)"Precip=", zx_t
    23972377  ENDIF
    … …  
    24072387     ENDDO
    24082388     DO i = 1, klon
    2409         z_factor(i) = (z_avant(i)-(rain_con(i)+snow_con(i))*dtime) &
     2389        z_factor(i) = (z_avant(i)-(rain_con(i)+snow_con(i))*pdtphys) &
    24102390             /z_apres(i)
    24112391     ENDDO
    … …  
    24372417           M_dwn(i,k)   = dnwd0(i,k)
    24382418           M_up(i,k)    = upwd(i,k)
    2439            dt_a(i,k)    = d_t_con(i,k)/dtime - ftd(i,k)
    2440            dq_a(i,k)    = d_q_con(i,k)/dtime - fqd(i,k)
     2419           dt_a(i,k)    = d_t_con(i,k)/pdtphys - ftd(i,k)
     2420           dq_a(i,k)    = d_q_con(i,k)/pdtphys - fqd(i,k)
    24412421        ENDDO
    24422422     ENDDO
    … …  
    24542434       DO k=1,klev
    24552435        DO i=1,klon
    2456        wdt_PBL(i,k) = wdt_PBL(i,k) + d_t_vdf_w(i,k)/dtime
    2457        wdq_PBL(i,k) = wdq_PBL(i,k) + d_q_vdf_w(i,k)/dtime
    2458        udt_PBL(i,k) = udt_PBL(i,k) + d_t_vdf_x(i,k)/dtime
    2459        udq_PBL(i,k) = udq_PBL(i,k) + d_q_vdf_x(i,k)/dtime
    2460 !!        dt_dwn(i,k)  = dt_dwn(i,k) + d_t_vdf_w(i,k)/dtime
    2461 !!        dq_dwn(i,k)  = dq_dwn(i,k) + d_q_vdf_w(i,k)/dtime
    2462 !!        dt_a  (i,k)    = dt_a(i,k) + d_t_vdf_x(i,k)/dtime
    2463 !!        dq_a  (i,k)    = dq_a(i,k) + d_q_vdf_x(i,k)/dtime
     2436       wdt_PBL(i,k) = wdt_PBL(i,k) + d_t_vdf_w(i,k)/pdtphys
     2437       wdq_PBL(i,k) = wdq_PBL(i,k) + d_q_vdf_w(i,k)/pdtphys
     2438       udt_PBL(i,k) = udt_PBL(i,k) + d_t_vdf_x(i,k)/pdtphys
     2439       udq_PBL(i,k) = udq_PBL(i,k) + d_q_vdf_x(i,k)/pdtphys
     2440!!        dt_dwn(i,k)  = dt_dwn(i,k) + d_t_vdf_w(i,k)/pdtphys
     2441!!        dq_dwn(i,k)  = dq_dwn(i,k) + d_q_vdf_w(i,k)/pdtphys
     2442!!        dt_a  (i,k)    = dt_a(i,k) + d_t_vdf_x(i,k)/pdtphys
     2443!!        dq_a  (i,k)    = dq_a(i,k) + d_q_vdf_x(i,k)/pdtphys
    24642444        ENDDO
    24652445       ENDDO
    … …  
    24702450!!        dt_dwn(i,k)  = dt_dwn(i,k) + 0.
    24712451!!        dq_dwn(i,k)  = dq_dwn(i,k) + 0.
    2472 !!        dt_a(i,k)   = dt_a(i,k)   + d_t_ajs(i,k)/dtime
    2473 !!        dq_a(i,k)   = dq_a(i,k)   + d_q_ajs(i,k)/dtime
    2474         udt_PBL(i,k)   = udt_PBL(i,k)   + d_t_ajs(i,k)/dtime
    2475         udq_PBL(i,k)   = udq_PBL(i,k)   + d_q_ajs(i,k)/dtime
     2452!!        dt_a(i,k)   = dt_a(i,k)   + d_t_ajs(i,k)/pdtphys
     2453!!        dq_a(i,k)   = dq_a(i,k)   + d_q_ajs(i,k)/pdtphys
     2454        udt_PBL(i,k)   = udt_PBL(i,k)   + d_t_ajs(i,k)/pdtphys
     2455        udq_PBL(i,k)   = udq_PBL(i,k)   + d_q_ajs(i,k)/pdtphys
    24762456        ENDDO
    24772457       ENDDO
    … …  
    24832463        DO k = 1,klev
    24842464           dt_dwn(:,k)= dt_dwn(:,k)+ &
    2485                 ok_wk_lsp(:)*(d_t_eva(:,k)+d_t_lsc(:,k))/dtime
     2465                ok_wk_lsp(:)*(d_t_eva(:,k)+d_t_lsc(:,k))/pdtphys
    24862466           dq_dwn(:,k)= dq_dwn(:,k)+ &
    2487                 ok_wk_lsp(:)*(d_q_eva(:,k)+d_q_lsc(:,k))/dtime
     2467                ok_wk_lsp(:)*(d_q_eva(:,k)+d_q_lsc(:,k))/pdtphys
    24882468        ENDDO
    24892469     ELSEIF (iflag_wake==3) THEN
    … …  
    24952475! a priri dans une region ou l'eau se reevapore).
    24962476                dt_dwn(i,k)= dt_dwn(i,k)+ &
    2497                 ok_wk_lsp(i)*d_t_lsc(i,k)/dtime
     2477                ok_wk_lsp(i)*d_t_lsc(i,k)/pdtphys
    24982478                dq_dwn(i,k)= dq_dwn(i,k)+ &
    2499                 ok_wk_lsp(i)*d_q_lsc(i,k)/dtime
     2479                ok_wk_lsp(i)*d_q_lsc(i,k)/pdtphys
    25002480              ENDIF
    25012481           ENDDO
    … …  
    25052485     !
    25062486     !calcul caracteristiques de la poche froide
    2507      call calWAKE (paprs,pplay,dtime &
     2487     call calWAKE (paprs,pplay,pdtphys &
    25082488          ,t_seri,q_seri,omega &
    25092489          ,dt_dwn,dq_dwn,M_dwn,M_up &
    … …  
    25272507     ! Faire rapidement disparaitre l'ancien dt_wake pour garder un d_t_wake
    25282508     ! coherent avec les autres d_t_...
    2529      d_t_wake(:,:)=dt_wake(:,:)*dtime
    2530      d_q_wake(:,:)=dq_wake(:,:)*dtime
     2509     d_t_wake(:,:)=dt_wake(:,:)*pdtphys
     2510     d_q_wake(:,:)=dq_wake(:,:)*pdtphys
    25312511     CALL add_phys_tend(du0,dv0,d_t_wake,d_q_wake,dql0,dqi0,paprs,'wake',abortphy)
    25322512     !------------------------------------------------------------------------
    … …  
    25382518  IF (ip_ebil_phy.ge.2) THEN
    25392519     ztit='after wake'
    2540      CALL diagetpq(cell_area,ztit,ip_ebil_phy,2,2,dtime &
     2520     CALL diagetpq(cell_area,ztit,ip_ebil_phy,2,2,pdtphys &
    25412521          , t_seri,q_seri,ql_seri,qs_seri,u_seri,v_seri,paprs,pplay &
    25422522          , d_h_vcol, d_qt, d_qw, d_ql, d_qs, d_ec)
    … …  
    27042684                 if ( (ale_bl_stat(i) .gt. abs(cin(i))+1.e-10) )  then
    27052685                    proba_notrig(i)=(1.-exp(-s_trig/s2(i)))** &
    2706                          (n2(i)*dtime/tau_trig(i))
     2686                         (n2(i)*pdtphys/tau_trig(i))
    27072687                    !        print *, 'proba_notrig(i) ',proba_notrig(i)
    27082688                    if (random_notrig(i) .ge. proba_notrig(i)) then
    … …  
    27232703                 if ( (Ale_bl(i) .gt. abs(cin(i))+1.e-10) )  then
    27242704                    proba_notrig(i)=(1.-exp(-s_trig/s2(i)))** &
    2725                          (n2(i)*dtime/tau_trig(i))
     2705                         (n2(i)*pdtphys/tau_trig(i))
    27262706                    !        print *, 'proba_notrig(i) ',proba_notrig(i)
    27272707                    if (random_notrig(i) .ge. proba_notrig(i)) then
    … …  
    28542834  IF (ip_ebil_phy.ge.2) THEN
    28552835     ztit='after dry_adjust'
    2856      CALL diagetpq(cell_area,ztit,ip_ebil_phy,2,2,dtime &
     2836     CALL diagetpq(cell_area,ztit,ip_ebil_phy,2,2,pdtphys &
    28572837          , t_seri,q_seri,ql_seri,qs_seri,u_seri,v_seri,paprs,pplay &
    28582838          , d_h_vcol, d_qt, d_qw, d_ql, d_qs, d_ec)
    … …  
    28842864  ENDIF
    28852865  !
    2886   CALL fisrtilp(dtime,paprs,pplay, &
     2866  CALL fisrtilp(pdtphys,paprs,pplay, &
    28872867       t_seri, q_seri,ptconv,ratqs, &
    28882868       d_t_lsc, d_q_lsc, d_ql_lsc, d_qi_lsc, rneb, cldliq, &
    … …  
    29162896             + snow_lsc(i))*cell_area(i)/REAL(klon)
    29172897     ENDDO
    2918      zx_t = zx_t/za*dtime
     2898     zx_t = zx_t/za*pdtphys
    29192899     WRITE(lunout,*)"Precip=", zx_t
    29202900  ENDIF
    … …  
    29222902  IF (ip_ebil_phy.ge.2) THEN
    29232903     ztit='after fisrt'
    2924      CALL diagetpq(cell_area,ztit,ip_ebil_phy,2,2,dtime &
     2904     CALL diagetpq(cell_area,ztit,ip_ebil_phy,2,2,pdtphys &
    29252905          , t_seri,q_seri,ql_seri,qs_seri,u_seri,v_seri,paprs,pplay &
    29262906          , d_h_vcol, d_qt, d_qw, d_ql, d_qs, d_ec)
    … …  
    31663146  IF (ip_ebil_phy.ge.2) THEN
    31673147     ztit="after diagcld"
    3168      CALL diagetpq(cell_area,ztit,ip_ebil_phy,2,2,dtime &
     3148     CALL diagetpq(cell_area,ztit,ip_ebil_phy,2,2,pdtphys &
    31693149          , t_seri,q_seri,ql_seri,qs_seri,u_seri,v_seri,paprs,pplay &
    31703150          , d_h_vcol, d_qt, d_qw, d_ql, d_qs, d_ec)
    … …  
    32313211     calday = REAL(days_elapsed + 1) + jH_cur
    32323212
    3233      call chemtime(itap+itau_phy-1, date0, dtime, itap)
     3213     call chemtime(itap+itau_phy-1, date0, pdtphys, itap)
    32343214     IF (config_inca == 'aero' .OR. config_inca == 'aeNP') THEN
    32353215        CALL AEROSOL_METEO_CALC( &
    … …  
    35603540  ! Ajouter la tendance des rayonnements (tous les pas)
    35613541  !
    3562   d_t_swr(:,:)=heat(:,:)*dtime/RDAY
    3563   d_t_lwr(:,:)=-cool(:,:)*dtime/RDAY
    3564   d_t_sw0(:,:)=heat0(:,:)*dtime/RDAY
    3565   d_t_lw0(:,:)=-cool0(:,:)*dtime/RDAY
     3542  d_t_swr(:,:)=heat(:,:)*pdtphys/RDAY
     3543  d_t_lwr(:,:)=-cool(:,:)*pdtphys/RDAY
     3544  d_t_sw0(:,:)=heat0(:,:)*pdtphys/RDAY
     3545  d_t_lw0(:,:)=-cool0(:,:)*pdtphys/RDAY
    35663546  CALL add_phys_tend(du0,dv0,d_t_swr,dq0,dql0,dqi0,paprs,'SW',abortphy)
    35673547  CALL add_phys_tend(du0,dv0,d_t_lwr,dq0,dql0,dqi0,paprs,'LW',abortphy)
    … …  
    35783558  IF (ip_ebil_phy.ge.2) THEN
    35793559     ztit='after rad'
    3580      CALL diagetpq(cell_area,ztit,ip_ebil_phy,2,2,dtime &
     3560     CALL diagetpq(cell_area,ztit,ip_ebil_phy,2,2,pdtphys &
    35813561          , t_seri,q_seri,ql_seri,qs_seri,u_seri,v_seri,paprs,pplay &
    35823562          , d_h_vcol, d_qt, d_qw, d_ql, d_qs, d_ec)
    … …  
    35913571  ! Calculer l'hydrologie de la surface
    35923572  !
    3593   !      CALL hydrol(dtime,pctsrf,rain_fall, snow_fall, zxevap,
     3573  !      CALL hydrol(pdtphys,pctsrf,rain_fall, snow_fall, zxevap,
    35943574  !     .            agesno, ftsol,fqsurf,fsnow, ruis)
    35953575  !
    … …  
    36293609     IF (ok_strato) THEN
    36303610
    3631         CALL drag_noro_strato(klon,klev,dtime,paprs,pplay, &
     3611        CALL drag_noro_strato(klon,klev,pdtphys,paprs,pplay, &
    36323612             zmea,zstd, zsig, zgam, zthe,zpic,zval, &
    36333613             igwd,idx,itest, &
    … …  
    36373617
    36383618     ELSE
    3639         CALL drag_noro(klon,klev,dtime,paprs,pplay, &
     3619        CALL drag_noro(klon,klev,pdtphys,paprs,pplay, &
    36403620             zmea,zstd, zsig, zgam, zthe,zpic,zval, &
    36413621             igwd,idx,itest, &
    … …  
    36763656     IF (ok_strato) THEN
    36773657
    3678         CALL lift_noro_strato(klon,klev,dtime,paprs,pplay, &
     3658        CALL lift_noro_strato(klon,klev,pdtphys,paprs,pplay, &
    36793659             lat_degrees,zmea,zstd,zpic,zgam,zthe,zpic,zval, &
    36803660             igwd,idx,itest, &
    … …  
    36843664
    36853665     ELSE
    3686         CALL lift_noro(klon,klev,dtime,paprs,pplay, &
     3666        CALL lift_noro(klon,klev,pdtphys,paprs,pplay, &
    36873667             lat_degrees,zmea,zstd,zpic, &
    36883668             itest, &
    … …  
    37023682  IF (ok_hines) then
    37033683
    3704      CALL hines_gwd(klon,klev,dtime,paprs,pplay, &
     3684     CALL hines_gwd(klon,klev,pdtphys,paprs,pplay, &
    37053685          lat_degrees,t_seri,u_seri,v_seri, &
    37063686          zustrhi,zvstrhi, &
    … …  
    37133693
    37143694  if (ok_gwd_rando) then
    3715      call FLOTT_GWD_rando(DTIME, pplay, t_seri, u_seri, v_seri, &
     3695     call FLOTT_GWD_rando(pdtphys, pplay, t_seri, u_seri, v_seri, &
    37163696          rain_fall + snow_fall, zustr_gwd_rando, zvstr_gwd_rando, &
    37173697          du_gwd_rando, dv_gwd_rando)
    … …  
    37353715  DO k = 1, klev
    37363716     DO i = 1, klon
    3737         zustrph(i)=zustrph(i)+(u_seri(i,k)-u(i,k))/dtime* &
     3717        zustrph(i)=zustrph(i)+(u_seri(i,k)-u(i,k))/pdtphys* &
    37383718             (paprs(i,k)-paprs(i,k+1))/rg
    3739         zvstrph(i)=zvstrph(i)+(v_seri(i,k)-v(i,k))/dtime* &
     3719        zvstrph(i)=zvstrph(i)+(v_seri(i,k)-v(i,k))/pdtphys* &
    37403720             (paprs(i,k)-paprs(i,k+1))/rg
    37413721     ENDDO
    … …  
    37573737  IF (ip_ebil_phy.ge.2) THEN
    37583738     ztit='after orography'
    3759      CALL diagetpq(cell_area,ztit,ip_ebil_phy,2,2,dtime &
     3739     CALL diagetpq(cell_area,ztit,ip_ebil_phy,2,2,pdtphys &
    37603740          , t_seri,q_seri,ql_seri,qs_seri,u_seri,v_seri,paprs,pplay &
    37613741          , d_h_vcol, d_qt, d_qw, d_ql, d_qs, d_ec)
    … …  
    37713751     CALL METHOX(1,klon,klon,klev,q_seri,d_q_ch4,pplay)
    37723752  ! ajout de la tendance d'humidite due au methane
    3773      CALL add_phys_tend(du0,dv0,dt0,d_q_ch4*dtime,dql0,'q_ch4',abortphy)
     3753     CALL add_phys_tend(du0,dv0,dt0,d_q_ch4*pdtphys,dql0,'q_ch4',abortphy)
    37743754  END IF
    37753755  !
    … …  
    37833763     ! adeclarer
    37843764#ifdef CPP_COSP
    3785      IF (itap.eq.1.or.MOD(itap,NINT(freq_cosp/dtime)).EQ.0) THEN
     3765     IF (itap.eq.1.or.MOD(itap,NINT(freq_cosp/pdtphys)).EQ.0) THEN
    37863766
    37873767      IF (prt_level .GE.10) THEN
    … …  
    37913771        !       print*,'Dans physiq.F avant appel cosp ref_liq,ref_ice=',
    37923772        !     s        ref_liq,ref_ice
    3793         call phys_cosp(itap,dtime,freq_cosp, &
     3773        call phys_cosp(itap,pdtphys,freq_cosp, &
    37943774             ok_mensuelCOSP,ok_journeCOSP,ok_hfCOSP, &
    37953775             ecrit_mth,ecrit_day,ecrit_hf, ok_all_xml, &
    … …  
    38313811  call phytrac ( &
    38323812       itap,     days_elapsed+1,    jH_cur,   debut, &
    3833        lafin,    dtime,     u, v,     t, &
     3813       lafin,    pdtphys,     u, v,     t, &
    38343814       paprs,    pplay,     pmfu,     pmfd, &
    38353815       pen_u,    pde_u,     pen_d,    pde_d, &
    … …  
    38643844          cdragh,coefh(1:klon,1:klev,is_ave),u1,v1,ftsol,pctsrf, &
    38653845          frac_impa, frac_nucl, &
    3866           pphis,cell_area,dtime,itap, &
     3846          pphis,cell_area,pdtphys,itap, &
    38673847          qx(:,:,ivap),da,phi,mp,upwd,dnwd)
    38683848
    … …  
    39043884  IF (ip_ebil_phy.ge.1) THEN
    39053885     ztit='after physic'
    3906      CALL diagetpq(cell_area,ztit,ip_ebil_phy,1,1,dtime &
     3886     CALL diagetpq(cell_area,ztit,ip_ebil_phy,1,1,pdtphys &
    39073887          , t_seri,q_seri,ql_seri,qs_seri,u_seri,v_seri,paprs,pplay &
    39083888          , d_h_vcol, d_qt, d_qw, d_ql, d_qs, d_ec)
    … …  
    39533933
    39543934     CALL chemhook_end ( &
    3955           dtime, &
     3935          pdtphys, &
    39563936          pplay, &
    39573937          t_seri, &
    … …  
    39873967  DO k = 1, klev
    39883968     DO i = 1, klon
    3989         d_u(i,k) = ( u_seri(i,k) - u(i,k) ) / dtime
    3990         d_v(i,k) = ( v_seri(i,k) - v(i,k) ) / dtime
    3991         d_t(i,k) = ( t_seri(i,k)-t(i,k) ) / dtime
    3992         d_qx(i,k,ivap) = ( q_seri(i,k) - qx(i,k,ivap) ) / dtime
    3993         d_qx(i,k,iliq) = ( ql_seri(i,k) - qx(i,k,iliq) ) / dtime
     3969        d_u(i,k) = ( u_seri(i,k) - u(i,k) ) / pdtphys
     3970        d_v(i,k) = ( v_seri(i,k) - v(i,k) ) / pdtphys
     3971        d_t(i,k) = ( t_seri(i,k)-t(i,k) ) / pdtphys
     3972        d_qx(i,k,ivap) = ( q_seri(i,k) - qx(i,k,ivap) ) / pdtphys
     3973        d_qx(i,k,iliq) = ( ql_seri(i,k) - qx(i,k,iliq) ) / pdtphys
    39943974!CR: on ajoute le contenu en glace
    39953975        if (nqo.eq.3) then
    3996         d_qx(i,k,isol) = ( qs_seri(i,k) - qx(i,k,isol) ) / dtime
     3976        d_qx(i,k,isol) = ( qs_seri(i,k) - qx(i,k,isol) ) / pdtphys
    39973977        endif
    39983978     ENDDO
    … …  
    40063986        DO  k = 1, klev
    40073987           DO  i = 1, klon
    4008 !              d_qx(i,k,iq) = ( tr_seri(i,k,iq-2) - qx(i,k,iq) ) / dtime
    4009                d_qx(i,k,iq) = ( tr_seri(i,k,iq-nqo) - qx(i,k,iq) ) / dtime
     3988!              d_qx(i,k,iq) = ( tr_seri(i,k,iq-2) - qx(i,k,iq) ) / pdtphys
     3989               d_qx(i,k,iq) = ( tr_seri(i,k,iq-nqo) - qx(i,k,iq) ) / pdtphys
    40103990           ENDDO
    40113991        ENDDO

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phytrac_mod.F90

    r3818 r3831  
    9494    USE iophy
    9595    USE traclmdz_mod
    96     USE tracinca_mod
    9796    USE tracreprobus_mod
    9897    !USE control_phy_mod
    99     USE inifis_mod, ONLY: config_inca, lunout
     98    USE print_control_mod, ONLY:  lunout
     99    USE tracinca_mod, ONLY: config_inca, tracinca_init, tracinca
    100100   
    101101    USE indice_sol_mod

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/radiation_AR4.F90

    r3817 r3831  
    66    psolswai, ok_ade, ok_aie)
    77  USE dimphy
    8   USE inifis_mod, ONLY: lunout
     8  USE print_control_mod, ONLY: lunout
    99  IMPLICIT NONE
    1010
    … …  
    21512151    plwup, plwdn, plwup0, plwdn0)
    21522152  USE dimphy
    2153   USE inifis_mod, ONLY: lunout
     2153  USE print_control_mod, ONLY: lunout
    21542154  IMPLICIT NONE
    21552155  ! ym#include "dimensions.h"

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/read_map2D.F90

    r3817 r3831  
    66  USE mod_grid_phy_lmdz
    77  USE mod_phys_lmdz_para
    8   USE inifis_mod, ONLY: lunout
     8  USE print_control_mod, ONLY: lunout
    99
    1010  IMPLICIT NONE
    … …  
    6565  CONTAINS
    6666    SUBROUTINE write_err_mess(err_mess)
    67       USE inifis_mod, ONLY: lunout
     67      USE print_control_mod, ONLY: lunout
    6868      IMPLICIT NONE
    6969      CHARACTER(len=*), INTENT(IN) :: err_mess

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/readaerosol.F90

    r3819 r3831  
    2020!****************************************************************************************
    2121  USE dimphy
    22   USE inifis_mod, ONLY: lunout
     22  USE print_control_mod, ONLY: lunout
    2323
    2424  IMPLICIT NONE
    … …  
    191191    USE mod_phys_lmdz_para
    192192    USE iophy, ONLY : io_lon, io_lat
    193     USE inifis_mod, ONLY: lunout
     193    USE print_control_mod, ONLY: lunout
    194194
    195195    IMPLICIT NONE
    … …  
    570570  SUBROUTINE check_err(status,text)
    571571    USE netcdf
    572     USE inifis_mod, ONLY: lunout
     572    USE print_control_mod, ONLY: lunout
    573573    IMPLICIT NONE
    574574

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/readaerosol_interp.F90

    r3819 r3831  
    2121  USE phys_cal_mod
    2222  USE pres2lev_mod
    23   USE inifis_mod, ONLY: lunout
     23  USE print_control_mod, ONLY: lunout
    2424
    2525  IMPLICIT NONE

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/regr_pr_o3_m.F90

    r3819 r3831  
    3232    use regr1_step_av_m, only: regr1_step_av
    3333    use press_coefoz_m, only: press_in_edg
    34     !use control_phy_mod, only: dayref
    35     use inifis_mod, only: dayref
     34    !use control_phy_mod, only: day_ref
     35    use time_phylmdz_mod, only: day_ref
    3636
    3737    REAL, intent(in):: p3d(:, :, :) ! pressure at layer interfaces, in Pa
    … …  
    5151
    5252    real r_mob(nbp_lat, size(press_in_edg) - 1)
    53     ! (ozone mole fraction from Mobidic at day "dayref")
     53    ! (ozone mole fraction from Mobidic at day "day_ref")
    5454    ! (r_mob(j, k) is at latitude "rlatu(j)", in pressure interval
    5555    ! "[press_in_edg(k), press_in_edg(k+1)]".)
    … …  
    6666    call nf95_inq_varid(ncid, "r_Mob", varid)
    6767    ! Get data at the right day from the input file:
    68     ncerr = nf90_get_var(ncid, varid, r_mob, start=(/1, 1, dayref/))
     68    ncerr = nf90_get_var(ncid, varid, r_mob, start=(/1, 1, day_ref/))
    6969    call handle_err("nf90_get_var r_Mob", ncerr)
    7070    ! Latitudes are in ascending order in the input file while

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/soil.F90

    r3817 r3831  
    88  USE mod_phys_lmdz_para
    99  USE indice_sol_mod
    10   USE inifis_mod, ONLY: lunout
     10  USE print_control_mod, ONLY: lunout
    1111
    1212  IMPLICIT NONE

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/solarlong.F90

    r3817 r3831  
    22
    33  USE ioipsl
    4   USE inifis_mod, ONLY: lunout
     4  USE print_control_mod, ONLY: lunout
    55
    66  IMPLICIT NONE

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/surf_land_orchidee_mod.F90

    r3825 r3831  
    4545    USE carbon_cycle_mod, ONLY : carbon_cycle_cpl
    4646    USE indice_sol_mod
    47     USE inifis_mod, ONLY: lunout
     47    USE print_control_mod, ONLY: lunout
    4848    USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
    4949

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/sw_aeroAR4.F90

    r3817 r3831  
    2222  USE dimphy
    2323  USE phys_output_mod, ONLY : swaero_diag
    24   USE inifis_mod, ONLY: lunout
     24  USE print_control_mod, ONLY: lunout
    2525  IMPLICIT NONE
    2626

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcellV0_main.F90

    r3825 r3831  
    1313
    1414      USE dimphy
    15       USE inifis_mod, ONLY: lunout, prt_level
     15      USE print_control_mod, ONLY: lunout, prt_level
    1616      IMPLICIT NONE
    1717
    … …  
    788788
    789789      subroutine testV0_ltherm(klon,klev,pplev,pplay,long,seuil,ztv,po,ztva,zqla,f_star,zw2,comment)
    790       USE inifis_mod, ONLY: prt_level
     790      USE print_control_mod, ONLY: prt_level
    791791      IMPLICIT NONE
    792792
    … …  
    831831!thermcell_closure: fermeture, determination de f
    832832!-------------------------------------------------------------------------
    833       USE inifis_mod, ONLY: prt_level, lunout
     833      USE print_control_mod, ONLY: prt_level, lunout
    834834      IMPLICIT NONE
    835835
    … …  
    910910!thermcell_plume: calcule les valeurs de qt, thetal et w dans l ascendance
    911911!--------------------------------------------------------------------------
    912       USE inifis_mod, ONLY: prt_level, lunout
     912      USE print_control_mod, ONLY: prt_level, lunout
    913913     
    914914      IMPLICIT NONE
    … …  
    17091709!thermcell_dry: calcul de zmax et wmax du thermique sec
    17101710!--------------------------------------------------------------------------
    1711        USe inifis_mod, ONLY: prt_level
     1711       USe print_control_mod, ONLY: prt_level
    17121712       IMPLICIT NONE
    17131713      include "YOMCST.h"       
    … …  
    19211921!thermcell_init: calcul du profil d alimentation du thermique
    19221922!----------------------------------------------------------------------
    1923       USE inifis_mod, ONLY: prt_level
     1923      USE print_control_mod, ONLY: prt_level
    19241924      IMPLICIT NONE
    19251925      include "thermcell.h"

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_dq.F90

    r3817 r3831  
    11      subroutine thermcell_dq(ngrid,nlay,impl,ptimestep,fm,entr,  &
    22     &           masse,q,dq,qa,lev_out)
    3       USE inifis_mod, ONLY: prt_level
     3      USE print_control_mod, ONLY: prt_level
    44      implicit none
    55
    … …  
    152152      subroutine thermcell_dq_o(ngrid,nlay,impl,ptimestep,fm,entr,  &
    153153     &           masse,q,dq,qa,lev_out)
    154       USE inifis_mod, ONLY: prt_level
     154      USE print_control_mod, ONLY: prt_level
    155155      implicit none
    156156

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_dry.F90

    r3817 r3831  
    1414! la temperature potentielle virtuelle pondérée par alim_star.
    1515!--------------------------------------------------------------------------
    16        USE inifis_mod, ONLY: prt_level
     16       USE print_control_mod, ONLY: prt_level
    1717       IMPLICIT NONE
    1818#include "YOMCST.h"       

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_dtke.F90

    r3817 r3831  
    11      subroutine thermcell_dtke(ngrid,nlay,nsrf,ptimestep,fm0,entr0,  &
    22     &           rg,pplev,tke)
    3       USE inifis_mod, ONLY: prt_level
     3      USE print_control_mod, ONLY: prt_level
    44      implicit none
    55

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_dv2.F90

    r3817 r3831  
    22     &    ,fraca,larga  &
    33     &    ,u,v,du,dv,ua,va,lev_out)
    4       USE inifis_mod, ONLY: prt_level, lunout
     4      USE print_control_mod, ONLY: prt_level, lunout
    55      implicit none
    66

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_env.F90

    r3817 r3831  
    66!necessaires au calcul des proprietes dans le thermique
    77!--------------------------------------------------------------
    8       USE inifis_mod, ONLY: prt_level
     8      USE print_control_mod, ONLY: prt_level
    99      IMPLICIT NONE
    1010

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_flux.F90

    r3817 r3831  
    1313!thermcell_flux: deduction des flux
    1414!---------------------------------------------------------------------------
    15       USE inifis_mod, ONLY: prt_level, lunout
     15      USE print_control_mod, ONLY: prt_level, lunout
    1616      IMPLICIT NONE
    1717     

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_flux2.F90

    r3817 r3831  
    1212!thermcell_flux: deduction des flux
    1313!---------------------------------------------------------------------------
    14       USE inifis_mod, ONLY: prt_level
     14      USE print_control_mod, ONLY: prt_level
    1515      IMPLICIT NONE
    1616#include "thermcell.h"

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_init.F90

    r3817 r3831  
    88!thermcell_init: calcul du profil d alimentation du thermique
    99!----------------------------------------------------------------------
    10       USE inifis_mod, ONLY: lunout
     10      USE print_control_mod, ONLY: lunout
    1111      IMPLICIT NONE
    1212#include "thermcell.h"

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_main.F90

    r3825 r3831  
    2424      USE ioipsl
    2525      USE indice_sol_mod
    26       USE inifis_mod, ONLY: lunout, prt_level
     26      USE print_control_mod, ONLY: lunout, prt_level
    2727      IMPLICIT NONE
    2828
    … …  
    10951095
    10961096      subroutine test_ltherm(klon,klev,pplev,pplay,long,seuil,ztv,po,ztva,zqla,f_star,zw2,comment)
    1097       USE inifis_mod, ONLY: prt_level
     1097      USE print_control_mod, ONLY: prt_level
    10981098      IMPLICIT NONE
    10991099
    … …  
    11361136      subroutine thermcell_tke_transport(ngrid,nlay,ptimestep,fm0,entr0,  &
    11371137     &           rg,pplev,therm_tke_max)
    1138       USE inifis_mod, ONLY: prt_level
     1138      USE print_control_mod, ONLY: prt_level
    11391139      implicit none
    11401140

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_plume.F90

    r3817 r3831  
    1313USE IOIPSL, ONLY : getin
    1414
    15        USE inifis_mod, ONLY: prt_level
     15       USE print_control_mod, ONLY: prt_level
    1616       IMPLICIT NONE
    1717
    … …  
    803803! Code ecrit par Catherine Rio, Arnaud Jam et Frederic Hourdin
    804804!--------------------------------------------------------------------------
    805       USE inifis_mod, ONLY: prt_level
     805      USE print_control_mod, ONLY: prt_level
    806806      IMPLICIT NONE
    807807

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/tracinca_mod.F90

    r3825 r3831  
    44!
    55! This module prepares and calls the INCA main subroutines.
    6 !
    7 
     6
     7!
     8  CHARACTER(len=4),SAVE :: config_inca
     9!$OMP THREADPRIVATE(config_inca)
     10 
    811CONTAINS
    912
    … …  
    1215
    1316    USE infotrac_phy
     17    USE mod_phys_lmdz_para
     18    USE ioipsl, ONLY : getin
    1419    IMPLICIT NONE
    1520   
    … …  
    1823    LOGICAL,INTENT(OUT) :: lessivage
    1924   
    20    
     25    !Config  Key  = config_inca
     26    !Config  Desc = Choix de configuration de INCA
     27    !Config  Def  = none
     28    !Config  Help = Choix de configuration de INCA :
     29    !Config         'none' = sans INCA
     30    !Config         'chem' = INCA avec calcul de chemie
     31    !Config         'aero' = INCA avec calcul des aerosols
     32    config_inca = 'none'
     33    IF (is_master) CALL getin('config_inca',config_inca)
     34    CALL bcast(config_inca)
     35     
    2136    ! Initialization
    2237    lessivage  =.FALSE.
    … …  
    4560    USE vampir
    4661    USE geometry_mod, ONLY : cell_area
    47     !USE control_phy_mod
    48     USE inifis_mod, ONLY: config_inca
    4962    USE indice_sol_mod
    5063

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/traclmdz_mod.F90

    r3817 r3831  
    9696    USE mod_phys_lmdz_para
    9797    USE indice_sol_mod
    98     USE inifis_mod, ONLY: lunout
     98    USE print_control_mod, ONLY: lunout
    9999
    100100! Input variables

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/wake.F90

    r3818 r3831  
    2020  USE dimphy
    2121  use mod_phys_lmdz_para
    22   USE inifis_mod, ONLY: prt_level
     22  USE print_control_mod, ONLY: prt_level
    2323  IMPLICIT NONE
    2424  ! ============================================================================

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/write_bilKP_ave.h

    r3819 r3831  
    99c Champs 2D:
    1010c
    11       itau_w = itau_phy + itap + start_time * day_step / iphysiq
     11      itau_w = itau_phy + itap + start_time * day_step
    1212c
    1313      CALL histwrite_phy(nid_bilKPave,"ue",itau_w,ue_lay)

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/write_bilKP_ins.h

    r3819 r3831  
    77      ndex3d = 0
    88c
    9       itau_w = itau_phy + itap + start_time * day_step / iphysiq
     9      itau_w = itau_phy + itap + start_time * day_step
    1010c
    1111c Champs 3D:

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/write_histREGDYN.h

    r3809 r3831  
    88
    99      ndex3d = 0
    10       itau_w = itau_phy + itap + start_time * day_step / iphysiq
     10      itau_w = itau_phy + itap + start_time * day_step
    1111c
    1212       CALL histwrite(nid_regdyn,"hw1",itau_w,histoW(:,:,:,1),

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/write_histday_seri.h

    r3825 r3831  
    77!
    88      ndex2d = 0
    9       itau_w = itau_phy + itap + start_time * day_step / iphysiq
     9      itau_w = itau_phy + itap + start_time * day_step
    1010!
    1111! Champs 2D:

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/write_histrac.h

    r3825 r3831  
    55  IF (ecrit_tra > 0.) THEN
    66     
    7      itau_w = itau_phy + nstep + start_time * day_step / iphysiq
     7     itau_w = itau_phy + nstep + start_time * day_step
    88     
    99     CALL histwrite_phy(nid_tra,.FALSE.,"phis",itau_w,pphis)

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/write_paramLMDZ_phy.h

    r3825 r3831  
    2727!
    2828      ndex2d = 0
    29       itau_w = itau_phy + itap + int(start_time * day_step / iphysiq)
     29      itau_w = itau_phy + itap + int(start_time * day_step )
    3030!
    3131! Variables globales

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/yamada4.F90

    r3818 r3831  
    55    cd, q2, km, kn, kq, ustar, iflag_pbl)
    66  USE dimphy
    7   USE inifis_mod, ONLY: prt_level
     7  USE print_control_mod, ONLY: prt_level
    88  IMPLICIT NONE
    99

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/yamada_c.F90

    r3818 r3831  
    66     &   ,iflag_pbl,okiophys)
    77      use dimphy
    8       USE inifis_mod, ONLY: prt_level
     8      USE print_control_mod, ONLY: prt_level
    99      IMPLICIT NONE
    1010#include "YOMCST.h"

  • dynamico_lmdz/aquaplanet/LMDZ5/libf/phymar/physiq.F90

    r3809 r3831  
    351351  t_wrt=pdtphys*iwrite_phys ! frequency of the outputs in the file
    352352  ! compute zjulian for annee0=1979 and month=1 dayref=1 and hour=0.0
    353   !CALL ymds2ju(annee0, month, dayref, hour, zjulian)
    354   call getin('anneeref',anneeref)
    355   call ymds2ju(anneeref, 1, 1, 0.0, zjulian)
    356   annee_ref=anneeref ! On la sauve pour le reste de la simulation
     353  !CALL ymds2ju(annee0, month, day_ref, hour, zjulian)
     354  call getin('anneeref',annee_ref)
     355  call ymds2ju(annee_ref, 1, 1, 0.0, zjulian)
     356!  annee_ref=anneeref ! On la sauve pour le reste de la simulation
    357357  dtime=pdtphys
    358358
    … …  
    483483! dt0_CP & dt0_RT modifiees ici selon Hubert avec daystep=720 ie dtdyn=2mn
    484484! pdtphys modifie via gcm.def avec iphysiq=1 & nsplit_phys=1
    485 dt0DYn=daysec/REAL(day_step)   !  Time Step, Dynamics                       [s]
     485
     486!!!!!
     487!ym Attention la signification de day_step a change => daystep==nbpdt de la physiq par jour
     488!ym => a adapter
     489!!!!!
     490dt0DYn=daysec/REAL(day_step_xxx)   !  Time Step, Dynamics                       [s]
    486491dt0_AT=pdtphys                 !  Time Step, SISVAT                         [s]
    487492dt0_SV=pdtphys                 !  Time Step, Atm_AT                         [s]
Note: See TracChangeset for help on using the changeset viewer.