Changeset 1573


Ignore:
Timestamp:
Jul 12, 2016, 3:17:48 PM (8 years ago)
Author:
emillour
Message:

All GCMS:
Cleanup concerning iniphysiq/inigeomphy initializations: initializations
related to routines in phy_common or dynphy_lonlat can be done in
inigeomphy, but any initialization for modules/routines in a physics
package (directory phy*) must be done in the related phy*/iniphysiq
routine.
EM

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/DOC/chantiers/commit_importants.log

    r1572 r1573  
    18331833- physiq_mod , write_hist*.h : use is_north_pole_phy and is_south_pole_phy
    18341834  to correctly compute mesh area at poles to send to hist*nc files.
     1835
     1836
     1837**********************
     1838**** commit_v1573 ****
     1839**********************
     1840Cleanup concerning iniphysiq/inigeomphy initializations: initializations
     1841related to routines in phy_common or dynphy_lonlat can be done in
     1842inigeomphy, but any initialization for modules/routines in a physics
     1843package (directory phy***) must be done in the related phy***/iniphysiq
     1844routine.
     1845

  • trunk/LMDZ.COMMON/libf/dynphy_lonlat/inigeomphy_mod.F90

    r1564 r1573  
    66                     nbp, communicator, &
    77                     rlatu,rlatv,rlonu,rlonv,aire,cu,cv)
    8   USE dimphy, ONLY: init_dimphy
    98  USE mod_grid_phy_lmdz, ONLY: klon_glo,  & ! number of atmospheric columns (on full grid)
    109                               regular_lonlat, &  ! regular longitude-latitude grid type
    … …  
    1514                                klon_mpi_begin ! start indes of columns (on local mpi grid)
    1615  USE geometry_mod, ONLY : init_geometry
    17 !  USE comgeomphy, ONLY: initcomgeomphy, &
    18 !                        airephy, & ! physics grid area (m2)
    19 !                        cuphy, & ! cu coeff. (u_covariant = cu * u)
    20 !                        cvphy, & ! cv coeff. (v_covariant = cv * v)
    21 !                        rlond, & ! longitudes
    22 !                        rlatd ! latitudes
    2316  USE physics_distribution_mod, ONLY : init_physics_distribution
    2417  USE regular_lonlat_mod, ONLY : init_regular_lonlat, &
    … …  
    220213                     airefi,cufi,cvfi)
    221214
    222 
    223   ! Initialize dimphy module
    224   CALL init_dimphy(klon_omp,nlayer)
    225 
    226215!$OMP END PARALLEL
    227216

  • trunk/LMDZ.COMMON/libf/dynphy_lonlat/phytitan/iniphysiq_mod.F90

    r1564 r1573  
    1717  USE inigeomphy_mod, ONLY: inigeomphy
    1818  USE control_mod, ONLY: nday
     19  USE dimphy, ONLY: init_dimphy
     20  USE mod_phys_lmdz_para, ONLY: klon_omp ! number of columns (on local omp grid)
    1921  IMPLICIT NONE
    2022
    … …  
    5456  !------------------------------------------
    5557  ! --> initialize physics distribution, global fields and geometry
     58  ! (i.e. things in phy_common or dynphy_lonlat)
    5659  CALL inigeomphy(ii,jj,nlayer, &
    5760               nbp, communicator, &
    … …  
    6063               airedyn,cudyn,cvdyn)
    6164
    62   ! the distinct part for all planetary physics
     65  ! the distinct part for all planetary physics  (ie. things in phytitan)
    6366  !------------------------------------------
    6467
    6568!$OMP PARALLEL
     69
     70  ! Initialize dimphy module
     71  call init_dimphy(klon_omp,nlayer)
    6672
    6773  ! Initialize some physical constants

  • trunk/LMDZ.COMMON/libf/dynphy_lonlat/phyvenus/iniphysiq_mod.F90

    r1564 r1573  
    1616  USE time_phylmdz_mod, ONLY: init_time
    1717  USE inigeomphy_mod, ONLY: inigeomphy
     18  USE dimphy, ONLY: init_dimphy
     19  USE mod_phys_lmdz_para, ONLY: klon_omp ! number of columns (on local omp grid)
    1820  IMPLICIT NONE
    1921
    … …  
    5355  !------------------------------------------
    5456  ! --> initialize physics distribution, global fields and geometry
     57  ! (i.e. things in phy_common or dynphy_lonlat)
    5558  CALL inigeomphy(ii,jj,nlayer, &
    5659               nbp, communicator, &
    … …  
    5962               airedyn,cudyn,cvdyn)
    6063
    61   ! the distinct part for all planetary physics
     64  ! the distinct part for all planetary physics (ie. things in phyvenus)
    6265  !------------------------------------------
    6366
    6467!$OMP PARALLEL
     68
     69  ! Initialize dimphy module
     70  call init_dimphy(klon_omp,nlayer)
    6571
    6672  ! Initialize some physical constants

  • trunk/LMDZ.GENERIC/README

    r1566 r1573  
    12321232  iniphysiq
    12331233
     1234== 12/07/2016 == EM
     1235- move initialization of dimphy from inigeomphy to iniphysiq (initializations
     1236related to routines in phy_common or dynphy_lonlat can be done in
     1237inigeomphy, but any initialization for modules/routines in a physics
     1238package (directory phystd) must be done in the related phystd/iniphysiq
     1239routine.

  • trunk/LMDZ.GENERIC/libf/dynphy_lonlat/inigeomphy_mod.F90

    r1566 r1573  
    66                     nbp, communicator, &
    77                     rlatu,rlatv,rlonu,rlonv,aire,cu,cv)
    8   USE dimphy, ONLY: init_dimphy
    98  USE mod_grid_phy_lmdz, ONLY: klon_glo,  & ! number of atmospheric columns (on full grid)
    109                               regular_lonlat, &  ! regular longitude-latitude grid type
    … …  
    1514                                klon_mpi_begin ! start indes of columns (on local mpi grid)
    1615  USE geometry_mod, ONLY : init_geometry
    17 !  USE comgeomphy, ONLY: initcomgeomphy, &
    18 !                        airephy, & ! physics grid area (m2)
    19 !                        cuphy, & ! cu coeff. (u_covariant = cu * u)
    20 !                        cvphy, & ! cv coeff. (v_covariant = cv * v)
    21 !                        rlond, & ! longitudes
    22 !                        rlatd ! latitudes
    2316  USE physics_distribution_mod, ONLY : init_physics_distribution
    2417  USE regular_lonlat_mod, ONLY : init_regular_lonlat, &
    … …  
    220213                     airefi,cufi,cvfi)
    221214
    222 
    223   ! Initialize dimphy module
    224   CALL init_dimphy(klon_omp,nlayer)
    225 
    226215!$OMP END PARALLEL
    227216

  • trunk/LMDZ.GENERIC/libf/dynphy_lonlat/phystd/iniphysiq_mod.F90

    r1564 r1573  
    2424! necessary to get klon_omp
    2525USE mod_phys_lmdz_para, ONLY: klon_omp ! number of columns (on local omp grid)
     26USE dimphy, ONLY: init_dimphy
    2627
    2728implicit none
    … …  
    5758  !------------------------------------------
    5859  ! --> initialize physics distribution, global fields and geometry
     60  ! (i.e. things in phy_common or dynphy_lonlat)
    5961  CALL inigeomphy(ii,jj,nlayer, &
    6062               nbp, communicator, &
    … …  
    6365               airedyn,cudyn,cvdyn)
    6466
    65   ! the distinct part for all planetary physics
     67  ! the distinct part for all planetary physics (ie. things in phystd)
    6668  !------------------------------------------
    6769
    … …  
    7072! copy some fundamental parameters to physics
    7173! and do some initializations
     74
     75! Initialize dimphy module
     76call init_dimphy(klon_omp,nlayer)
    7277
    7378! copy over preff , ap() and bp()

  • trunk/LMDZ.MARS/README

    r1566 r1573  
    23062306- missing libf/dynphy_lonlat/phymars/inigeomphy_mod.F90 in previous commit
    23072307
     2308== 12/07/2016 == EM
     2309- move initialization of dimphy from inigeomphy to iniphysiq (initializations
     2310related to routines in phy_common or dynphy_lonlat can be done in
     2311inigeomphy, but any initialization for modules/routines in a physics
     2312package (directory phymars) must be done in the related phymars/iniphysiq
     2313routine.

  • trunk/LMDZ.MARS/libf/dynphy_lonlat/inigeomphy_mod.F90

    r1566 r1573  
    66                     nbp, communicator, &
    77                     rlatu,rlatv,rlonu,rlonv,aire,cu,cv)
    8   USE dimphy, ONLY: init_dimphy
    98  USE mod_grid_phy_lmdz, ONLY: klon_glo,  & ! number of atmospheric columns (on full grid)
    109                               regular_lonlat, &  ! regular longitude-latitude grid type
    … …  
    1514                                klon_mpi_begin ! start indes of columns (on local mpi grid)
    1615  USE geometry_mod, ONLY : init_geometry
    17 !  USE comgeomphy, ONLY: initcomgeomphy, &
    18 !                        airephy, & ! physics grid area (m2)
    19 !                        cuphy, & ! cu coeff. (u_covariant = cu * u)
    20 !                        cvphy, & ! cv coeff. (v_covariant = cv * v)
    21 !                        rlond, & ! longitudes
    22 !                        rlatd ! latitudes
    2316  USE physics_distribution_mod, ONLY : init_physics_distribution
    2417  USE regular_lonlat_mod, ONLY : init_regular_lonlat, &
    … …  
    220213                     airefi,cufi,cvfi)
    221214
    222 
    223   ! Initialize dimphy module
    224   CALL init_dimphy(klon_omp,nlayer)
    225 
    226215!$OMP END PARALLEL
    227216

  • trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/iniphysiq_mod.F90

    r1564 r1573  
    2020! necessary to get klon_omp
    2121USE mod_phys_lmdz_para, ONLY: klon_omp ! number of columns (on local omp grid)
     22USE dimphy, ONLY: init_dimphy
    2223
    2324implicit none
    … …  
    4950  !------------------------------------------
    5051  ! --> initialize physics distribution, global fields and geometry
     52  ! (i.e. things in phy_common or dynphy_lonlat)
    5153  CALL inigeomphy(ii,jj,nlayer, &
    5254               nbp, communicator, &
    … …  
    5557               airedyn,cudyn,cvdyn)
    5658
    57   ! the distinct part for all planetary physics
     59  ! the distinct part for all planetary physics (ie. things in phymars)
    5860  !------------------------------------------
    5961
    … …  
    6264! copy some fundamental parameters to physics
    6365! and do some initializations
     66
     67! Initialize dimphy module
     68call init_dimphy(klon_omp,nlayer)
    6469
    6570call phys_state_var_init(klon_omp,nlayer,nqtot, &
Note: See TracChangeset for help on using the changeset viewer.