Changeset 1443


Ignore:
Timestamp:
Jun 5, 2015, 3:05:35 PM (10 years ago)
Author:
emillour
Message:

Titan and Venus GCMs:
Follow-up to the changes in dynamics/physics interface: ener.h, logic.h, serre.h and temps.h are now modules.
EM

Location:
trunk
Files:
4 added
10 deleted
33 edited

Legend:

Unmodified
Added
Removed

  • trunk/LMDZ.COMMON/libf/dyn3d_common/fxhyp_m.F90

    r1441 r1443  
    2222    use nrtype, only: pi, pi_d, twopi, twopi_d, k8
    2323    use principal_cshift_m, only: principal_cshift
     24    use serre_mod, only: clon,grossismx,dzoomx,taux
    2425
    2526    include "dimensions.h"
    2627    ! for iim
    27 
    28     include "serre.h"
    29     ! for clon, grossismx, dzoomx, taux
    3028
    3129    REAL, intent(out):: xprimm025(:), rlonv(:), xprimv(:) ! (iim + 1)

  • trunk/LMDZ.COMMON/libf/dyn3d_common/fyhyp_m.F90

    r1441 r1443  
    1818    use coefpoly_m, only: coefpoly
    1919    use nrtype, only: k8
     20    use serre_mod, only: clat, dzoomy, grossismy, tauy
    2021
    2122    include "dimensions.h"
    2223    ! for jjm
    23 
    24     include "serre.h"
    25     ! for clat, grossismy, dzoomy, tauy
    2624
    2725    REAL, intent(out):: rlatu(jjm + 1), yyprimu(jjm + 1)

  • trunk/LMDZ.COMMON/libf/dyn3d_common/invert_zoom_x_m.F90

    r1441 r1443  
    1111    use coefpoly_m, only: coefpoly
    1212    use nrtype, only: pi, pi_d, twopi_d, k8
     13    use serre_mod, only: clon
    1314
    1415    include "dimensions.h"
    1516    ! for iim
    16 
    17     include "serre.h"
    18     ! for clon
    1917
    2018    REAL(K8), intent(in):: Xf(0:), xtild(0:), Xprimt(0:) ! (0:2 * nmax)

  • trunk/LMDZ.COMMON/libf/dyn3d_common/principal_cshift_m.F90

    r1441 r1443  
    1212
    1313    use nrtype, only: twopi
     14    use serre_mod, only: clon
    1415
    1516    include "dimensions.h"
    1617    ! for iim
    17 
    18     include "serre.h"
    19     ! for clon
    2018
    2119    integer, intent(in):: is2

  • trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phytitan/ini_archive.F

    r1442 r1443  
    3737#include "paramet.h"
    3838#include "comgeom.h"
    39 #include "temps.h"
    40 #include "ener.h"
    41 #include "logic.h"
    4239#include "description.h"
    43 #include "serre.h"
    4440#include "netcdf.inc"
    4541

  • trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phytitan/newstart.F

    r1442 r1443  
    2828     .                       aps,bps,scaleheight,pseudoalt,
    2929     .                       disvert_type,pressure_exner
    30 
     30      USE serre_mod, ONLY: clon,clat,grossismx,grossismy,
     31     &                     dzoomx,dzoomy,taux,tauy
     32      USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
     33      USE logic_mod, ONLY: iflag_trac,fxyhypb,ysinus
     34      USE temps_mod, ONLY: day_ref,annee_ref
    3135      implicit none
    3236
    … …  
    3539#include "comdissnew.h"
    3640#include "comgeom2.h"
    37 #include "logic.h"
    38 #include "temps.h"
    39 #include "ener.h"
    4041#include "description.h"
    41 #include "serre.h"
    4242#include "dimsoil.h"
    4343#include "netcdf.inc"

  • trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phytitan/readstart.F

    r1442 r1443  
    1010     .                       aps,bps,scaleheight,pseudoalt,
    1111     .                       disvert_type,pressure_exner
    12      
     12      USE serre_mod, ONLY: clon,clat,grossismx,grossismy
     13      USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
     14      USE temps_mod, ONLY: day_ref,annee_ref,day_ini,itau_dyn,
     15     &                     start_time
     16      USE logic_mod, ONLY: fxyhypb,ysinus,iflag_trac
    1317      IMPLICIT NONE
    1418
    … …  
    3034#include "dimensions.h"
    3135#include "paramet.h"
    32 #include "temps.h"
    3336#include "comgeom.h"
    34 #include "ener.h"
    3537#include "description.h"
    36 #include "serre.h"
    37 #include "logic.h"
    3838#include "netcdf.inc"
    3939

  • trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phytitan/start2archive.F

    r1442 r1443  
    2525     .                       aps,bps,scaleheight,pseudoalt,
    2626     .                       disvert_type,pressure_exner
     27      USE logic_mod, ONLY: iflag_trac
    2728
    2829      implicit none
    … …  
    3233#include "comdissnew.h"
    3334#include "comgeom.h"
    34 #include "logic.h"
    35 #include "temps.h"
    36 #include "ener.h"
    3735#include "description.h"
    3836#include "dimsoil.h"

  • trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phytitan/write_archive.F

    r1442 r1443  
    4343#include "comgeom.h"
    4444#include "description.h"
    45 #include "temps.h"
    4645#include "netcdf.inc"
    4746

  • trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phytitan/writerestart.F

    r1442 r1443  
    1919#include "paramet.h"
    2020#include "comgeom.h"
    21 #include "ener.h"
    22 #include "logic.h"
    2321#include "netcdf.inc"
    2422#include "description.h"
    25 #include "serre.h"
    2623
    2724c   Arguments:

  • trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phyvenus/ini_archive.F

    r1442 r1443  
    3737#include "paramet.h"
    3838#include "comgeom.h"
    39 #include "temps.h"
    40 #include "ener.h"
    41 #include "logic.h"
    4239#include "description.h"
    43 #include "serre.h"
    4440#include "netcdf.inc"
    4541

  • trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phyvenus/newstart.F

    r1442 r1443  
    2828     .                       aps,bps,scaleheight,pseudoalt,
    2929     .                       disvert_type,pressure_exner
    30 
     30      USE serre_mod, ONLY: clon,clat,grossismx,grossismy,
     31     &                     dzoomx,dzoomy,taux,tauy
     32      USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
     33      USE logic_mod, ONLY: iflag_trac,fxyhypb,ysinus
     34      USE temps_mod, ONLY: day_ref,annee_ref
    3135      implicit none
    3236
    … …  
    3539#include "comdissnew.h"
    3640#include "comgeom2.h"
    37 #include "logic.h"
    38 #include "temps.h"
    39 #include "ener.h"
    4041#include "description.h"
    41 #include "serre.h"
    4242#include "dimsoil.h"
    4343#include "netcdf.inc"

  • trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phyvenus/readstart.F

    r1442 r1443  
    1010     .                       aps,bps,scaleheight,pseudoalt,
    1111     .                       disvert_type,pressure_exner
    12      
     12      USE serre_mod, ONLY: clon,clat,grossismx,grossismy
     13      USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
     14      USE temps_mod, ONLY: day_ref,annee_ref,day_ini,itau_dyn,
     15     &                     start_time
     16      USE logic_mod, ONLY: fxyhypb,ysinus,iflag_trac
    1317      IMPLICIT NONE
    1418
    … …  
    3034#include "dimensions.h"
    3135#include "paramet.h"
    32 #include "temps.h"
    3336#include "comgeom.h"
    34 #include "ener.h"
    3537#include "description.h"
    36 #include "serre.h"
    37 #include "logic.h"
    3838#include "netcdf.inc"
    3939

  • trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phyvenus/start2archive.F

    r1442 r1443  
    2525     .                       aps,bps,scaleheight,pseudoalt,
    2626     .                       disvert_type,pressure_exner
     27      USE logic_mod, ONLY: iflag_trac
    2728
    2829      implicit none
    … …  
    3233#include "comdissnew.h"
    3334#include "comgeom.h"
    34 #include "logic.h"
    35 #include "temps.h"
    36 #include "ener.h"
    3735#include "description.h"
    3836#include "dimsoil.h"

  • trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phyvenus/write_archive.F

    r1442 r1443  
    4343#include "comgeom.h"
    4444#include "description.h"
    45 #include "temps.h"
    4645#include "netcdf.inc"
    4746

  • trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phyvenus/writerestart.F

    r1442 r1443  
    1919#include "paramet.h"
    2020#include "comgeom.h"
    21 #include "ener.h"
    22 #include "logic.h"
    2321#include "netcdf.inc"
    2422#include "description.h"
    25 #include "serre.h"
    2623
    2724c   Arguments:

  • trunk/LMDZ.TITAN/libf/phytitan/clmain.F

    r1048 r1443  
    144144c======================================================================
    145145c
    146 #include "temps.h"
    147146      LOGICAL zxli ! utiliser un jeu de fonctions simples
    148147      PARAMETER (zxli=.FALSE.)

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

    r1442 r1443  
    3232#include "comcstfi.h"
    3333#include "netcdf.inc"
    34 #include "logic.h"
    3534#include "clesphys.h"
    3635#include "iniprint.h"

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

    r1056 r1443  
    1515      USE comgeomphy,  only: rlatd,rlond
    1616      USE control_mod, only: raz_date
     17      USE temps_mod, only: itau_phy
    1718
    1819implicit none
    … …  
    2627#include "clesphys.h"
    2728#include "tabcontrol.h"
    28 #include "temps.h"
    2929!======================================================================
    3030

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

    r1056 r1443  
    1414      USE comgeomphy,  only: rlatd,rlond
    1515      USE control_mod, only: raz_date
     16      USE temps_mod, only: day_end, annee_ref, itau_phy
    1617
    1718      implicit none
    … …  
    2526#include "clesphys.h"
    2627#include "tabcontrol.h"
    27 #include "temps.h"
    2828!======================================================================
    2929

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

    r1356 r1443  
    7272      USE moyzon_mod
    7373      USE write_field_phy
     74      USE temps_mod, only: itau_phy,day_ref,annee_ref
     75      USE logic_mod, only: iflag_trac,moyzon_ch,moyzon_mu
    7476      IMPLICIT none
    7577c======================================================================
    … …  
    8587#include "dimsoil.h"
    8688#include "clesphys.h"
    87 #include "temps.h"
    8889#include "iniprint.h"
    89 #include "logic.h"
    9090#include "tabcontrol.h"
    9191#include "comorbit.h"

  • trunk/LMDZ.TITAN/libf/phytitan/phytrac.F

    r1126 r1443  
    4545      USE moyzon_mod
    4646      USE write_field_phy
     47      USE logic_mod, ONLY: moyzon_ch,moyzon_mu
    4748      IMPLICIT none
    4849#include "dimensions.h"
    … …  
    5253#include "varmuphy.h"
    5354#include "itemps.h"
    54 #include "logic.h"
    5555
    5656c======================================================================

  • trunk/LMDZ.TITAN/libf/phytitan/readstartphy.F

    r1055 r1443  
    1919#include "netcdf.inc"
    2020#include "dimsoil.h"
    21 #include "temps.h"
    2221c======================================================================
    2322      integer ngridmx

  • trunk/LMDZ.TITAN/libf/phytitan/scal_wind.F

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

  • trunk/LMDZ.TITAN/libf/phytitan/wind_scal.F

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

  • trunk/LMDZ.VENUS/libf/phyvenus/clmain.F

    r1301 r1443  
    144144c======================================================================
    145145c
    146 #include "temps.h"
    147146      LOGICAL zxli ! utiliser un jeu de fonctions simples
    148147      PARAMETER (zxli=.FALSE.)

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

    r1442 r1443  
    3434#include "comcstfi.h"
    3535#include "netcdf.inc"
    36 #include "logic.h"
    3736#include "clesphys.h"
    3837#include "iniprint.h"

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

    r1301 r1443  
    1515      USE comgeomphy,  only: rlatd,rlond
    1616      USE control_mod, only: raz_date
     17      USE temps_mod, only: itau_phy
    1718
    1819implicit none
    … …  
    2627#include "clesphys.h"
    2728#include "tabcontrol.h"
    28 #include "temps.h"
    2929!======================================================================
    3030

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

    r973 r1443  
    1414      USE comgeomphy,  only: rlatd,rlond
    1515      USE control_mod, only: raz_date
     16      USE temps_mod, only: day_end, annee_ref, itau_phy
    1617
    1718      implicit none
    … …  
    2526#include "clesphys.h"
    2627#include "tabcontrol.h"
    27 #include "temps.h"
    2828!======================================================================
    2929

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

    r1442 r1443  
    7070      use moyzon_mod, only: tmoy
    7171      use ieee_arithmetic
     72      use temps_mod, only: itau_phy,day_ref,annee_ref
     73      use logic_mod, only: iflag_trac
    7274      IMPLICIT none
    7375c======================================================================
    … …  
    8486#include "dimsoil.h"
    8587#include "clesphys.h"
    86 #include "temps.h"
    8788#include "iniprint.h"
    8889#include "timerad.h"
    89 #include "logic.h"
    9090#include "tabcontrol.h"
    9191#include "nirdata.h"

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

    r1305 r1443  
    3737#include "dimensions.h"
    3838#include "clesphys.h"
    39 #include "temps.h"
    4039#include "paramet.h"
    4140c======================================================================

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

    r1160 r1443  
    3434#include "dimensions.h"
    3535#include "clesphys.h"
    36 #include "temps.h"
    3736#include "paramet.h"
    3837c======================================================================

  • trunk/LMDZ.VENUS/libf/phyvenus/readstartphy.F

    r1301 r1443  
    1919#include "netcdf.inc"
    2020#include "dimsoil.h"
    21 #include "temps.h"
    2221c======================================================================
    2322      integer ngridmx
Note: See TracChangeset for help on using the changeset viewer.