Changeset 1525 for trunk


Ignore:
Timestamp:
Mar 30, 2016, 8:24:43 AM (9 years ago)
Author:
emillour
Message:

All GCMs:
More on enforcing dynamics/physics separation: get rid of references to "control_mod" from physics packages.
EM

Location:
trunk
Files:
2 added
40 edited
4 moved

Legend:

Unmodified
Added
Removed

  • TabularUnified trunk/DOC/chantiers/commit_importants.log

    r1524 r1525  
    16471647
    16481648**********************
    1649 **** commit_v1523 ****
     1649**** commit_v1524 ****
    16501650**********************
    16511651Ehouarn: More updates to enforce dynamics/physics separation:
    … …  
    16531653  make a "time_phylmdz_mod.F90" module to store that
    16541654  information and fill it via "iniphysiq".
     1655
     1656**********************
     1657**** commit_v1525 ****
     1658**********************
     1659Ehouarn: Further adaptations to enforce dynamics/physics separation:
     1660- get rid of references to "control_mod" from physics packages.

  • TabularUnified trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phytitan/iniphysiq_mod.F90

    r1524 r1525  
    1616                                klon_omp_end, & ! end index of local omp subgrid
    1717                                klon_mpi_begin ! start indes of columns (on local mpi grid)
     18  USE control_mod, ONLY: nday
    1819  USE comgeomphy, ONLY: initcomgeomphy, &
    1920                        airephy, & ! physics grid area (m2)
    … …  
    175176
    176177  ! Initialize some "temporal and calendar" related variables
    177   CALL init_time(annee_ref,day_ref,day_ini,day_end,ptimestep)
     178  CALL init_time(annee_ref,day_ref,day_ini,day_end,nday,ptimestep)
    178179
    179180!$OMP END PARALLEL

  • TabularUnified trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phyvenus/scal_wind.F

    r1520 r1525  
    1515#include "dimensions.h"
    1616#include "paramet.h"
    17 #include "comgeom.h"
    1817
    1918c   Arguments:

  • TabularUnified trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phyvenus/wind_scal.F

    r1520 r1525  
    1515#include "dimensions.h"
    1616#include "paramet.h"
    17 #include "comgeom.h"
    1817
    1918c   Arguments:

  • TabularUnified trunk/LMDZ.GENERIC/README

    r1524 r1525  
    11481148  to module "time_phylmdz_mod".
    11491149- made "inifis" a module.
     1150
     1151== 30/03/2016 == EM
     1152- Got rid of references to "control_mod" from the physics. Added a couple
     1153  of relevent variables for outputs in time_phylmdz_mod.

  • TabularUnified trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/phystd/iniphysiq_mod.F90

    r1524 r1525  
    1414                               klon_omp_end, & ! end index of local omp subgrid
    1515                               klon_mpi_begin ! start indes of columns (on local mpi grid)
    16 
     16use control_mod, only: nday
    1717use comgeomphy, only : initcomgeomphy, &
    1818                       airephy, & ! physics grid area (m2)
    … …  
    176176! copy some fundamental parameters to physics
    177177! and do some initializations
    178 call inifis(klon_omp,nlayer,nqtot,pdayref,punjours,ptimestep, &
     178call inifis(klon_omp,nlayer,nqtot,pdayref,punjours,nday,ptimestep, &
    179179            rlatd,rlond,airephy,prad,pg,pr,pcpp)
    180180

  • TabularUnified trunk/LMDZ.GENERIC/libf/phystd/dyn1d/kcm1d.F90

    r1403 r1525  
    99  use planete_mod
    1010  use callkeys_mod, only: check_cpp_match, pceil, tstrat, tracer
    11 !  use control_mod
     11  use inifis_mod, only: inifis
    1212  use comcstfi_mod
    1313  implicit none
    … …  
    203203  call calc_cpp_mugaz
    204204
    205   call inifis(1,llm,0,86400.0,1.0,0.0,0.0,1.0,rad,g,r,cpp)
     205  call inifis(1,llm,0,1,86400.0,1,1.0,&
     206              (/0.0/),(/0.0/),(/1.0/),&
     207              rad,g,r,cpp)
    206208
    207209  ! Tracer initialisation

  • TabularUnified trunk/LMDZ.GENERIC/libf/phystd/dyn1d/rcm1d.F

    r1524 r1525  
    1212      use comsoil_h, only: nsoilmx, layer, mlayer, inertiedat, volcapa
    1313      USE comgeomfi_h, only: lati, long, area
    14       use control_mod, only: day_step, ecritphy
    1514      use phyredem, only: physdem0,physdem1
    1615      use comgeomphy, only: initcomgeomphy
    … …  
    2120      use comcstfi_mod, only: pi, cpp, rad, g, r,
    2221     &                        mugaz, rcp, omeg
    23       use time_phylmdz_mod, only: daysec, dtphys
     22      use time_phylmdz_mod, only: daysec, dtphys, day_step, ecritphy,
     23     &                            nday
    2424      use callkeys_mod, only: tracer,check_cpp_match,rings_shadow,
    2525     &                        specOLR,water,pceil,ok_slab_ocean
    … …  
    488488      call getin("ndt",ndt)
    489489      write(*,*) " ndt = ",ndt
     490      nday=ndt
    490491
    491492      ndt=ndt*day_step     
    … …  
    505506!!! - physical frequency: nevermind, in inifis this is a simple print
    506507      cpp=1.d-7 !JL because we divide by cpp in inifis, there may be a more elegant solution
    507       CALL inifis(1,llm,nq,day0,daysec,dtphys,
     508      CALL inifis(1,llm,nq,day0,daysec,nday,dtphys,
    508509     .            latitude,longitude,area,rad,g,r,cpp)
    509510!!! We check everything is OK.

  • TabularUnified trunk/LMDZ.GENERIC/libf/phystd/inifis_mod.F90

    r1524 r1525  
    55
    66  SUBROUTINE inifis(ngrid,nlayer,nq, &
    7              day_ini,pdaysec,ptimestep, &
     7             day_ini,pdaysec,nday,ptimestep, &
    88             plat,plon,parea, &
    99             prad,pg,pr,pcpp)
    … …  
    1414  use comgeomfi_h, only: long, lati, area, totarea, totarea_planet
    1515  use comsoil_h, only: ini_comsoil_h
    16   use control_mod, only: ecritphy
     16  use time_phylmdz_mod, only: ecritphy,day_step,iphysiq, &
     17                              init_time, daysec, dtphys
    1718  use comcstfi_mod, only: rad, cpp, g, r, rcp, &
    1819                          mugaz, pi, avocado
    … …  
    2021  use planetwide_mod, only: planetwide_sumval
    2122  use callkeys_mod
    22   use time_phylmdz_mod, only: init_time, daysec, dtphys
    2323
    2424!=======================================================================
    … …  
    6464
    6565  REAL,INTENT(IN) :: prad,pg,pr,pcpp,pdaysec,ptimestep
    66  
     66  INTEGER,INTENT(IN) :: nday
    6767  INTEGER,INTENT(IN) :: ngrid,nlayer,nq
    6868  REAL,INTENT(IN) :: plat(ngrid),plon(ngrid),parea(ngrid)
    … …  
    9191
    9292  ! Initialize some "temporal and calendar" related variables
    93   CALL init_time(day_ini,pdaysec,ptimestep)
    94 
    95   ! read in 'ecritphy' (frequency of calls to physics, in dynamical steps)
    96   ! (also done in dyn3d/defrun_new but not in LMDZ.COMMON)
    97   call getin_p("ecritphy",ecritphy)
     93  CALL init_time(day_ini,pdaysec,nday,ptimestep)
     94
     95  ! read in some parameters from "run.def" for physics,
     96  ! or shared between dynamics and physics.
     97  call getin_p("ecritphy",ecritphy) ! frequency of outputs in physics,
     98                                    ! in dynamical steps
     99  call getin_p("day_step",day_step) ! number of dynamical steps per day
     100  call getin_p("iphysiq",iphysiq) ! call physics every iphysiq dyn step
    98101
    99102! --------------------------------------------------------------

  • TabularUnified trunk/LMDZ.GENERIC/libf/phystd/physiq.F90

    r1524 r1525  
    2424                          igcm_h2o_ice, igcm_h2o_vap, igcm_dustbin, &
    2525                          igcm_co2_ice
    26       use control_mod, only: ecritphy, iphysiq, nday
     26      use time_phylmdz_mod, only: ecritphy, iphysiq, nday
    2727      use phyredem, only: physdem0, physdem1
    2828      use slab_ice_h

  • TabularUnified trunk/LMDZ.GENERIC/libf/phystd/time_phylmdz_mod.F90

    r1524 r1525  
    44    REAL,SAVE    :: dtphys     ! physics time step (s)
    55!$OMP THREADPRIVATE(dtphys)
     6    INTEGER,SAVE :: day_step    ! number of dynamical steps per day
     7                                ! (set via inifis)
     8!$OMP THREADPRIVATE(day_step)
     9    INTEGER,SAVE :: nday       ! number of days to run
     10!$OMP THREADPRIVATE(nday)
    611    REAL,SAVE    :: daysec     ! length of day (s)
    712!$OMP THREADPRIVATE(daysec)
    … …  
    914!$OMP THREADPRIVATE(day_ini)
    1015
     16    INTEGER,SAVE :: ecritphy  ! for diagfi.nc outputs, write every ecritphy
     17                              ! dynamical steps (set via inifis)
     18!$OMP THREADPRIVATE(ecritphy)
     19    INTEGER,SAVE :: iphysiq   ! call physics every iphysiq dynamical step
     20                              ! (set via inifis)
     21!$OMP THREADPRIVATE(iphysiq)
     22
    1123CONTAINS
    1224
    13   SUBROUTINE init_time(day_ini_, daysec_, dtphys_)
     25  SUBROUTINE init_time(day_ini_, daysec_, nday_, dtphys_)
    1426    IMPLICIT NONE
    1527    INTEGER,INTENT(IN) :: day_ini_
    1628    REAL,INTENT(IN) :: daysec_
     29    INTEGER,INTENT(IN) :: nday_
    1730    REAL,INTENT(IN) :: dtphys_
    1831   
    1932    day_ini=day_ini_
    2033    daysec=daysec_
     34    nday=nday_
    2135    dtphys=dtphys_
    2236

  • TabularUnified trunk/LMDZ.GENERIC/libf/phystd/writediagfi.F

    r1524 r1525  
    4040!=================================================================
    4141      use surfdat_h, only: phisfi
    42       use control_mod, only: ecritphy, day_step, iphysiq
     42      use time_phylmdz_mod, only: ecritphy, day_step, iphysiq, day_ini
    4343      USE mod_phys_lmdz_para, only : is_parallel, is_mpi_root,
    4444     &                               is_master, gather
    4545      USE mod_grid_phy_lmdz, only : klon_glo, Grid1Dto2D_glo
    46       USE time_phylmdz_mod, ONLY: day_ini
    4746      implicit none
    4847

  • TabularUnified trunk/LMDZ.GENERIC/libf/phystd/writediagsoil.F90

    r1315 r1525  
    1313
    1414use comsoil_h, only: nsoilmx
    15 use control_mod, only: ecritphy, day_step, iphysiq
     15use time_phylmdz_mod, only: ecritphy, day_step, iphysiq
    1616use mod_phys_lmdz_para, only : is_mpi_root, is_master, gather
    1717use mod_grid_phy_lmdz, only : klon_glo, Grid1Dto2D_glo

  • TabularUnified trunk/LMDZ.GENERIC/libf/phystd/writediagspecIR.F

    r1524 r1525  
    4848      use mod_grid_phy_lmdz, only : klon_glo, Grid1Dto2D_glo
    4949#endif
    50       use control_mod, only: ecritphy, iphysiq, day_step
     50      use time_phylmdz_mod, only: ecritphy, iphysiq, day_step, day_ini
    5151      use callkeys_mod, only: iradia
    52       use time_phylmdz_mod, ONLY: day_ini
    5352
    5453      implicit none

  • TabularUnified trunk/LMDZ.GENERIC/libf/phystd/writediagspecVI.F

    r1524 r1525  
    4848      use mod_grid_phy_lmdz, only : klon_glo, Grid1Dto2D_glo
    4949#endif
    50       use control_mod, only: ecritphy, iphysiq, day_step
     50      use time_phylmdz_mod, only: ecritphy, iphysiq, day_step, day_ini
    5151      use callkeys_mod, only: iradia
    52       use time_phylmdz_mod, ONLY: day_ini
    5352
    5453      implicit none

  • TabularUnified trunk/LMDZ.MARS/README

    r1524 r1525  
    22322232  to module "time_phylmdz_mod".
    22332233- Made "phys_state_var_init" a module
     2234
     2235== 30/03/2016 == EM
     2236- Got rid of references to "control_mod" from the physics. Added a couple
     2237  of relevent variables for outputs in time_phylmdz_mod.
     2238

  • TabularUnified trunk/LMDZ.MARS/libf/phymars/conf_phys.F

    r1524 r1525  
    3838      use surfdat_h, only: albedo_h2o_ice, inert_h2o_ice,
    3939     &                     frost_albedo_threshold
    40       use control_mod, only: ecritphy
     40      use time_phylmdz_mod, only: ecritphy,day_step,iphysiq,ecritstart,
     41     &                            daysec,dtphys
    4142      use planete_h
    42       use time_phylmdz_mod, only: daysec,dtphys
    4343      use dimradmars_mod, only: naerkind, name_iaer,
    4444     &                      ini_scatterers,tauvis
    … …  
    5050
    5151      INTEGER,INTENT(IN) :: ngrid,nlayer,nq
    52       INTEGER ig,ierr,j
     52      INTEGER ierr,j
    5353 
    5454      CHARACTER ch1*12
    55       CHARACTER ch80*80
    56 
    57       ! read in 'ecritphy' (frequency of calls to physics, in dynamical steps)
    58       ! (also done in dyn3d/defrun_new but not in LMDZ.COMMON)
    59       call getin("ecritphy",ecritphy)
    60      
     55
     56      ! read in some parameters from "run.def" for physics,
     57      ! or shared between dynamics and physics.
     58      ecritphy=240 ! default value
     59      call getin("ecritphy",ecritphy) ! frequency of outputs in physics,
     60                                      ! in dynamical steps
     61      day_step=960 ! default value
     62      call getin("day_step",day_step) ! number of dynamical steps per day
     63      iphysiq=20 ! default value
     64      call getin("iphysiq",iphysiq) ! call physics every iphysiq dyn step
     65      ecritstart=0 ! default value
     66      call getin("ecritstart",ecritstart) ! write a restart every ecristart steps
    6167! --------------------------------------------------------------
    6268!  Reading the "callphys.def" file controlling some key options

  • TabularUnified trunk/LMDZ.MARS/libf/phymars/dyn1d/testphys1d.F

    r1524 r1525  
    1111     &                     watercaptag
    1212      use slope_mod, only: theta_sl, psi_sl
    13       use control_mod, only: day_step
    1413      use phyredem, only: physdem0,physdem1
    1514      use comgeomphy, only: initcomgeomphy
    … …  
    1716     &                     obliquit, emin_turb, lmixmin
    1817      use comcstfi_h, only: pi, rad, omeg, g, mugaz, rcp, r, cpp
    19       use time_phylmdz_mod, only: daysec, dtphys
     18      use time_phylmdz_mod, only: daysec, dtphys, day_step
    2019      use dimradmars_mod, only: tauscaling,tauvis
    2120      USE comvert_mod, ONLY: ap,bp,aps,bps,pa,preff,sig

  • TabularUnified trunk/LMDZ.MARS/libf/phymars/phyetat0.F90

    r1266 r1525  
    66  use surfdat_h, only: phisfi, albedodat, z0, z0_default,&
    77                       zmea, zstd, zsig, zgam, zthe
    8   use control_mod, only: timestart
    98  use iostart, only: nid_start, open_startphy, close_startphy, &
    109                     get_field, get_var, inquire_field, &
    1110                     inquire_dimension, inquire_dimension_length
     11  use ioipsl_getincom, only : getin
    1212
    1313  implicit none
    … …  
    7979      LOGICAL :: found
    8080
     81      REAL :: timestart ! to pick which initial state to start from
     82
    8183! open physics initial state file:
    8284call open_startphy(fichnom)
    … …  
    167169     
    168170! Time axis
     171! obtain timestart from run.def
     172timestart=-9999 ! default value
     173call getin("timestart",timestart)
     174
    169175found=inquire_dimension("Time")
    170176if (.not.found) then

  • TabularUnified trunk/LMDZ.MARS/libf/phymars/physiq.F

    r1524 r1525  
    2525      use slope_mod, only: theta_sl, psi_sl
    2626      use conc_mod, only: rnew, cpnew, mmean
    27       use control_mod, only: iphysiq, day_step, ecritstart
     27      use time_phylmdz_mod, only: iphysiq, day_step, ecritstart, daysec
    2828      use dimradmars_mod, only: tauscaling, aerosol,
    2929     &                          dtrad, fluxrad_sky, fluxrad, albedo,
    … …  
    3434     &                     obliquit
    3535      USE comcstfi_h, only: r, cpp, mugaz, g, rcp, pi, rad
    36       use time_phylmdz_mod, only: daysec
    3736      use param_v4_h, only: nreact,n_avog,
    3837     &                      fill_data_thermos, allocate_param_thermos

  • TabularUnified trunk/LMDZ.MARS/libf/phymars/time_phylmdz_mod.F90

    r1524 r1525  
    44    REAL,SAVE    :: dtphys      ! physics time step (s)
    55!$OMP THREADPRIVATE(pdtphys)
     6    INTEGER,SAVE :: day_step    ! number of dynamical steps per day
     7                                ! (set via conf_phys)
     8!$OMP THREADPRIVATE(day_step)
    69    REAL,SAVE    :: daysec     ! length of day (s)
    710!$OMP THREADPRIVATE(daysec)
    … …  
    1215!$OMP THREADPRIVATE(hour_ini)
    1316
     17    INTEGER,SAVE :: ecritphy    ! for diagfi.nc outputs, write every ecritphy
     18                                ! dynamical steps (set via conf_phys)
     19!$OMP THREADPRIVATE(ecritphy)
     20    INTEGER,SAVE :: iphysiq   ! call physics every iphysiq dynamical step
     21                              ! (set via conf_phys)
     22!$OMP THREADPRIVATE(iphysiq)
     23    INTEGER,SAVE :: ecritstart ! write a restart state every ecritstart
     24                               ! dynamical steps (set via conf_phys)
     25!$OMP THREADPRIVATE(ecritstart)
    1426CONTAINS
    1527
    1628  SUBROUTINE init_time(day_ini_, hour_ini_, daysec_, dtphys_)
     29    USE ioipsl_getin_p_mod, ONLY : getin_p
    1730    IMPLICIT NONE
    1831    INTEGER,INTENT(IN) :: day_ini_
    … …  
    2538    daysec=daysec_
    2639    dtphys=dtphys_
    27 
     40   
    2841  END SUBROUTINE init_time
    2942

  • TabularUnified trunk/LMDZ.MARS/libf/phymars/writediagfi.F

    r1524 r1525  
    4040!=================================================================
    4141      use surfdat_h, only: phisfi
    42       use control_mod, only: ecritphy, day_step, iphysiq
     42      use time_phylmdz_mod, only: ecritphy, day_step, iphysiq, day_ini
    4343      USE mod_phys_lmdz_para, only : is_parallel, is_mpi_root,
    4444     &                               is_master, gather
    4545      USE mod_grid_phy_lmdz, only : klon_glo, Grid1Dto2D_glo
    46       USE time_phylmdz_mod, ONLY: day_ini
    4746      implicit none
    4847

  • TabularUnified trunk/LMDZ.MARS/libf/phymars/writediagsoil.F90

    r1266 r1525  
    1313
    1414use comsoil_h, only: nsoilmx
    15 use control_mod, only: ecritphy, day_step, iphysiq
     15use time_phylmdz_mod, only: ecritphy, day_step, iphysiq
    1616use mod_phys_lmdz_para, only : is_mpi_root, is_master, gather
    1717use mod_grid_phy_lmdz, only : klon_glo, Grid1Dto2D_glo

  • TabularUnified trunk/LMDZ.TITAN/libf/phytitan/common_mod.F90

    r1126 r1525  
    8989SUBROUTINE common_init
    9090use dimphy
    91 USE control_mod
    9291IMPLICIT NONE
    9392#include "dimensions.h"

  • TabularUnified trunk/LMDZ.TITAN/libf/phytitan/dyn1d/rcm1d.F

    r1523 r1525  
    22     
    33      USE infotrac
    4       use control_mod
     4      use control_mod, only: planet_type, day_step
    55      use comgeomphy
    66      USE phys_state_var_mod

  • TabularUnified trunk/LMDZ.TITAN/libf/phytitan/phyetat0.F90

    r1524 r1525  
    1414      USE infotrac
    1515      USE comgeomphy,  only: rlatd,rlond
    16       USE control_mod, only: raz_date
    17       USE time_phylmdz_mod, only: itau_phy
     16      USE time_phylmdz_mod, only: itau_phy, raz_date
    1817
    1918implicit none

  • TabularUnified trunk/LMDZ.TITAN/libf/phytitan/phyredem.F90

    r1524 r1525  
    1313      USE infotrac
    1414      USE comgeomphy,  only: rlatd,rlond
    15       USE control_mod, only: raz_date
    16       USE time_phylmdz_mod, only: day_end, annee_ref, itau_phy
     15      USE time_phylmdz_mod, only: day_end, annee_ref, itau_phy, raz_date
    1716
    1817      implicit none

  • TabularUnified trunk/LMDZ.TITAN/libf/phytitan/phys_state_var_mod.F90

    r1356 r1525  
    9797!======================================================================
    9898SUBROUTINE phys_state_var_init
    99 use dimphy
    100 USE control_mod
     99
    101100IMPLICIT NONE
    102101#include "dimsoil.h"
    … …  
    145144!======================================================================
    146145SUBROUTINE phys_state_var_end
    147 use dimphy
    148 use control_mod
     146
    149147IMPLICIT NONE
    150148

  • TabularUnified trunk/LMDZ.TITAN/libf/phytitan/physiq.F

    r1524 r1525  
    5757!      USE histcom ! not needed; histcom is included in ioipsl
    5858      USE infotrac
    59       USE control_mod
    6059      use dimphy
    6160      USE comgeomphy
    … …  
    7271      USE moyzon_mod
    7372      USE write_field_phy
    74       USE time_phylmdz_mod, only: itau_phy,day_ref,annee_ref
     73      USE time_phylmdz_mod, only: itau_phy,day_ref,annee_ref,nday
    7574      USE logic_mod, only: iflag_trac,moyzon_ch,moyzon_mu
    7675      IMPLICIT none

  • TabularUnified trunk/LMDZ.TITAN/libf/phytitan/time_phylmdz_mod.F90

    r1524 r1525  
    44    REAL,SAVE    :: pdtphys     ! physics time step (s)
    55!$OMP THREADPRIVATE(pdtphys)
     6    INTEGER,SAVE :: nday        ! number of days to run
     7!$OMP THREADPRIVATE(nday)
    68    INTEGER,SAVE :: annee_ref   ! reference year from the origin
    79!$OMP THREADPRIVATE(annee_ref)
    … …  
    1214    INTEGER,SAVE :: day_end     ! final day of the run since first day of annee_ref
    1315!$OMP THREADPRIVATE(day_end)
     16    INTEGER,SAVE :: raz_date    ! flag to reset date (0:no, 1:yes)
     17!$OMP THREADPRIVATE(raz_date)
    1418    INTEGER,SAVE :: itau_phy     ! number of physics iterations
    1519!$OMP THREADPRIVATE(itau_phy)
    … …  
    1721CONTAINS
    1822
    19   SUBROUTINE init_time(annee_ref_, day_ref_, day_ini_, day_end_, pdtphys_)
     23  SUBROUTINE init_time(annee_ref_, day_ref_, day_ini_, day_end_, &
     24                       nday_, pdtphys_)
     25    USE ioipsl_getin_p_mod, ONLY : getin_p
    2026    IMPLICIT NONE
    2127    INTEGER,INTENT(IN) :: annee_ref_
    … …  
    2329    INTEGER,INTENT(IN) :: day_ini_
    2430    INTEGER,INTENT(IN) :: day_end_
     31    INTEGER,INTENT(IN) :: nday_
    2532    REAL,INTENT(IN) :: pdtphys_
    2633   
    … …  
    2936    day_ini=day_ini_
    3037    day_end=day_end_
     38    nday=nday_
    3139    pdtphys=pdtphys_
    3240
     41    ! Initialize module variable not inherited from dynamics
     42    raz_date = 0 ! default value
     43    CALL getin_p('raz_date', raz_date)
     44   
    3345  END SUBROUTINE init_time
    3446

  • TabularUnified trunk/LMDZ.VENUS/libf/phyvenus/conc.F90

    r1452 r1525  
    6868     subroutine conc_init
    6969     USE dimphy
    70      USE control_mod
    7170     implicit none
    7271#include"param.h"

  • TabularUnified trunk/LMDZ.VENUS/libf/phyvenus/dyn1d/rcm1d.F

    r1523 r1525  
    22     
    33      USE infotrac
    4       use control_mod
     4      use control_mod, only: planet_type, day_step
    55      use comgeomphy
    66      USE phys_state_var_mod

  • TabularUnified trunk/LMDZ.VENUS/libf/phyvenus/new_cloud_sedim.F

    r1442 r1525  
    66      USE ioipsl
    77      USE infotrac
    8       USE control_mod
    98      USE dimphy
    109      USE comgeomphy

  • TabularUnified trunk/LMDZ.VENUS/libf/phyvenus/new_photochemistry_venus.F90

    r1506 r1525  
    44 SUBROUTINE new_photochemistry_venus(nz, n_lon, ptimestep, p, t ,tr, mumean, sza_input, nesp)
    55
    6 ! USE ioipsl
    7 ! USE control_mod
    8 ! USE dimphy
    9 ! USE comgeomphy
    106 USE chemparam_mod
    117 USE infotrac

  • TabularUnified trunk/LMDZ.VENUS/libf/phyvenus/phyetat0.F90

    r1524 r1525  
    1414      USE infotrac
    1515      USE comgeomphy,  only: rlatd,rlond
    16       USE control_mod, only: raz_date
    17       USE time_phylmdz_mod, only: itau_phy
     16      USE time_phylmdz_mod, only: itau_phy, raz_date
    1817
    1918implicit none

  • TabularUnified trunk/LMDZ.VENUS/libf/phyvenus/phyredem.F90

    r1524 r1525  
    1313      USE infotrac
    1414      USE comgeomphy,  only: rlatd,rlond
    15       USE control_mod, only: raz_date
    16       USE time_phylmdz_mod, only: day_end, annee_ref, itau_phy
     15      USE time_phylmdz_mod, only: day_end, annee_ref, itau_phy, raz_date
    1716
    1817      implicit none

  • TabularUnified trunk/LMDZ.VENUS/libf/phyvenus/phys_state_var_mod.F90

    r1314 r1525  
    110110!======================================================================
    111111SUBROUTINE phys_state_var_init
    112 use dimphy
    113 USE control_mod
     112
    114113IMPLICIT NONE
    115114#include "dimsoil.h"
    … …  
    161160!======================================================================
    162161SUBROUTINE phys_state_var_end
    163 use dimphy
    164 use control_mod
     162
    165163IMPLICIT NONE
    166164

  • TabularUnified trunk/LMDZ.VENUS/libf/phyvenus/physiq.F

    r1524 r1525  
    5757!      USE histcom ! not needed; histcom is included in ioipsl
    5858      USE infotrac
    59       USE control_mod
    6059      use dimphy
    6160      USE comgeomphy

  • TabularUnified trunk/LMDZ.VENUS/libf/phyvenus/phytrac_chimie.F

    r1452 r1525  
    2424cAA 1/ le call phytrac se fait avec nqmax
    2525c======================================================================
    26 c      USE ioipsl
    27 c      USE infotrac
    28 c      USE control_mod
    29 c      USE dimphy
    30 c      USE comgeomphy
    3126      USE chemparam_mod
    3227      use conc, only: mmean

  • TabularUnified trunk/LMDZ.VENUS/libf/phyvenus/phytrac_emiss.F

    r1519 r1525  
    2828c
    2929c======================================================================
    30       USE ioipsl
    3130      USE infotrac
    32       USE control_mod
    3331      use dimphy
    3432      USE comgeomphy

  • TabularUnified trunk/LMDZ.VENUS/libf/phyvenus/phytrac_relax.F

    r1519 r1525  
    2525c
    2626c======================================================================
    27       USE ioipsl
    2827      USE infotrac
    29       USE control_mod
    3028      use dimphy
    3129      USE comgeomphy

  • TabularUnified trunk/LMDZ.VENUS/libf/phyvenus/time_phylmdz_mod.F90

    r1524 r1525  
    1212    INTEGER,SAVE :: day_end     ! final day of the run since first day of annee_ref
    1313!$OMP THREADPRIVATE(day_end)
     14    INTEGER,SAVE :: raz_date    ! flag to reset date (0:no, 1:yes)
     15!$OMP THREADPRIVATE(raz_date)
    1416    INTEGER,SAVE :: itau_phy     ! number of physics iterations
    1517!$OMP THREADPRIVATE(itau_phy)
    … …  
    1820
    1921  SUBROUTINE init_time(annee_ref_, day_ref_, day_ini_, day_end_, pdtphys_)
     22    USE ioipsl_getin_p_mod, ONLY : getin_p
    2023    IMPLICIT NONE
    2124    INTEGER,INTENT(IN) :: annee_ref_
    … …  
    3134    pdtphys=pdtphys_
    3235
     36    ! Initialize module variable not inherited from dynamics
     37    raz_date = 0 ! default value
     38    CALL getin_p('raz_date', raz_date)
     39   
    3340  END SUBROUTINE init_time
    3441
Note: See TracChangeset for help on using the changeset viewer.