Ignore:
Timestamp:
Apr 22, 2016, 9:02:11 AM (9 years ago)
Author:
emillour
Message:

All models: Further adaptations to keep up with changes in LMDZ5 concerning
physics/dynamics separation:

  • dyn3d:
  • adapted gcm.F so that all physics initializations are now done in iniphysiq.
  • dyn3dpar:
  • adapted gcm.F so that all physics initializations are now done in iniphysiq.
  • updated calfis_p.F to follow up with changes.
  • copied over updated "bands.F90" from LMDZ5.
  • dynphy_lonlat:
  • calfis_p.F90, mod_interface_dyn_phys.F90, follow up of changes in phy_common/mod_* routines
  • phy_common:
  • added "geometry_mod.F90" to store information about the grid (replaces phy*/comgeomphy.F90) and give variables friendlier names: rlond => longitude , rlatd => latitude, airephy => cell_area, cuphy => dx , cvphy => dy
  • added "physics_distribution_mod.F90"
  • updated "mod_grid_phy_lmdz.F90", "mod_phys_lmdz_mpi_data.F90", "mod_phys_lmdz_para.F90", "mod_phys_lmdz_mpi_transfert.F90", "mod_grid_phy_lmdz.F90", "mod_phys_lmdz_omp_data.F90", "mod_phys_lmdz_omp_transfert.F90", "write_field_phy.F90" and "ioipsl_getin_p_mod.F90" to LMDZ5 versions.
  • phy[venus/titan/mars/std]:
  • removed "init_phys_lmdz.F90", "comgeomphy.F90"; adapted routines to use geometry_mod (longitude, latitude, cell_area, etc.)

EM

Location:
trunk/LMDZ.GENERIC/libf/phystd
Files:
1 added
2 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/LMDZ.GENERIC/libf/phystd/condense_co2.F90

    r1542 r1543  
    1111      use aerosol_mod, only : iaero_co2
    1212      USE surfdat_h, only: emisice, emissiv
    13       USE comgeomphy, only: latitude ! in radians
     13      USE geometry_mod, only: latitude ! in radians
    1414      USE tracer_h, only: noms, rho_co2
    1515      use comcstfi_mod, only: g, r, cpp

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

    r1542 r1543  
    33! to use  'getin'
    44      use ioipsl_getincom, only: getin
     5      use dimphy, only : init_dimphy
     6      use mod_grid_phy_lmdz, only : regular_lonlat
    57      use infotrac, only: nqtot, tname
    68      use surfdat_h, only: albedodat, phisfi, dryness, watercaptag,
    … …  
    911     &                     dtemisice
    1012      use comdiurn_h, only: sinlat, coslat, sinlon, coslon
    11 !      use comsaison_h
    1213      use comsoil_h, only: nsoilmx, layer, mlayer, inertiedat, volcapa
    1314      use phyredem, only: physdem0,physdem1
    14       use comgeomphy, only: initcomgeomphy, cell_area
     15      use geometry_mod, only: init_geometry
    1516      use slab_ice_h, only: noceanmx
    1617      use planete_mod, only: apoastr,periastr,year_day,peri_day,
    … …  
    2728      use regular_lonlat_mod, only: init_regular_lonlat
    2829      use planete_mod, only: ini_planete_mod
     30      use physics_distribution_mod, only: init_physics_distribution
     31      use regular_lonlat_mod, only: init_regular_lonlat
     32      use mod_interface_dyn_phys, only: init_interface_dyn_phys
    2933      use inifis_mod, only: inifis
    3034      implicit none
    … …  
    133137      character*20,allocatable :: nametrac(:)   ! name of the tracer (no need for adv trac common)
    134138
    135       real :: latitude(1), longitude(1)
     139      real :: latitude(1), longitude(1), cell_area(1)
    136140
    137141c=======================================================================
    … …  
    140144! initialize "serial/parallel" related stuff
    141145!      CALL init_phys_lmdz(iim,jjm+1,llm,1,(/(jjm-1)*iim+2/))
    142       CALL init_phys_lmdz(1,1,llm,1,(/1/))
    143       call initcomgeomphy
     146!      CALL init_phys_lmdz(1,1,llm,1,(/1/))
     147!      call initcomgeomphy
    144148
    145149      !! those are defined in surfdat_h.F90
    … …  
    490494
    491495      ! initializations, as with iniphysiq.F90 for the 3D GCM
     496      call init_physics_distribution(regular_lonlat,4,
     497     &                               1,1,1,nlayer,1)
     498      call init_interface_dyn_phys
    492499      CALL init_regular_lonlat(1,1,longitude,latitude,
    493500     &                   (/0.,0./),(/0.,0./))
    494      
     501      call init_geometry(1,longitude,latitude,
     502     &                   (/0.,0.,0.,0./),(/0.,0.,0.,0./),
     503     &                   cell_area)
     504      call init_dimphy(1,nlayer) ! Initialize dimphy module
    495505      call ini_planete_mod(nlayer,preff,ap,bp)
    496506

  • trunk/LMDZ.GENERIC/libf/phystd/hydrol.F90

    r1542 r1543  
    1010  USE surfdat_h
    1111  use comdiurn_h
    12   USE comgeomphy, only: cell_area
     12  USE geometry_mod, only: cell_area
    1313  USE tracer_h
    1414  use slab_ice_h

  • trunk/LMDZ.GENERIC/libf/phystd/phyredem.F90

    r1542 r1543  
    1010! create physics restart file and write time-independent variables
    1111  use comsoil_h, only: volcapa, mlayer
    12   use comgeomphy, only: cell_area
     12  use geometry_mod, only: cell_area
    1313  use surfdat_h, only: zmea, zstd, zsig, zgam, zthe, &
    1414                       emisice, emissiv,             &

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

    r1542 r1543  
    1919      use comsaison_h, only: mu0, fract, dist_star, declin, right_ascen
    2020      use comsoil_h, only: nsoilmx, layer, mlayer, inertiedat
    21       use comgeomphy, only: latitude, longitude, cell_area
     21      use geometry_mod, only: latitude, longitude, cell_area
    2222      USE comgeomfi_h, only: totarea, totarea_planet
    2323      USE tracer_h, only: noms, mmol, radius, rho_q, qext, &

  • trunk/LMDZ.GENERIC/libf/phystd/rings.F90

    r1542 r1543  
    55
    66    use comdiurn_h, only: sinlat, sinlon, coslat, coslon
    7     use comgeomphy, only: latitude ! (rad)
     7    use geometry_mod, only: latitude ! (rad)
    88 
    99    implicit none   

  • trunk/LMDZ.GENERIC/libf/phystd/soil.F

    r1542 r1543  
    88      use time_phylmdz_mod, only: daysec
    99      use planete_mod, only: year_day
    10       use comgeomphy, only: longitude, latitude ! in radians
     10      use geometry_mod, only: longitude, latitude ! in radians
    1111
    1212      implicit none

  • trunk/LMDZ.GENERIC/libf/phystd/surface_nature.F

    r1542 r1543  
    44      USE surfdat_h
    55      USE comsoil_h
    6       USE comgeomphy, ONLY: cell_area
     6      USE geometry_mod, ONLY: cell_area
    77      USE tracer_h
    88

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

    r1542 r1543  
    4040!=================================================================
    4141      use surfdat_h, only: phisfi
    42       use comgeomphy, only: cell_area
     42      use geometry_mod, only: cell_area
    4343      use time_phylmdz_mod, only: ecritphy, day_step, iphysiq, day_ini
    4444      USE mod_phys_lmdz_para, only : is_parallel, is_mpi_root,

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

    r1542 r1543  
    1313
    1414use comsoil_h, only: nsoilmx, inertiedat
    15 use comgeomphy, only: cell_area
     15use geometry_mod, only: cell_area
    1616use time_phylmdz_mod, only: ecritphy, day_step, iphysiq
    1717use mod_phys_lmdz_para, only : is_mpi_root, is_master, gather

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

    r1542 r1543  
    4343! Addition by RW (2010) to allow OLR to be saved in .nc format
    4444      use radinc_h, only : L_NSPECTI
    45       use comgeomphy, only: cell_area
     45      use geometry_mod, only: cell_area
    4646      use mod_phys_lmdz_para, only : is_mpi_root, is_master, gather
    4747      use mod_grid_phy_lmdz, only : klon_glo, Grid1Dto2D_glo,

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

    r1542 r1543  
    4343! Addition by RW (2010) to allow OSR to be saved in .nc format
    4444      use radinc_h, only : L_NSPECTV
    45       use comgeomphy, only: cell_area
     45      use geometry_mod, only: cell_area
    4646      use mod_phys_lmdz_para, only : is_mpi_root, is_master, gather
    4747      use mod_grid_phy_lmdz, only : klon_glo, Grid1Dto2D_glo,
Note: See TracChangeset for help on using the changeset viewer.