Changeset 1564


Ignore:
Timestamp:
May 20, 2016, 8:16:32 AM (9 years ago)
Author:
emillour
Message:

All GCMS:

  • correction wrt previous commit: inigeom is also the name of a routine

in dyn3d_common! To avoid confusion rename inigeom (in dynphy_lonlat)
inigeomphy.

  • cosmetic cleanup in leapfrog ('fake' calls to init_phys_lmdz,

which no longer exists, removed).
EM

Location:
trunk
Files:
9 edited
1 moved

Legend:

Unmodified
Added
Removed
  • TabularUnified trunk/DOC/chantiers/commit_importants.log

    r1549 r1564  
    17671767- calfis_p.F: added computation of relative wind vorticity (input required
    17681768  by Earth physics)
     1769
     1770**********************
     1771**** commit_v1563 ****
     1772**********************
     1773
     1774iniphysiq in all GCMs
     1775---------------------
     1776
     1777iniphysiq was performing two main tasks
     1778- one that is planet-independent i.e. setting the physics grid and geometry
     1779(we checked: the lines of code in phyxxx/iniphysiq_mod were doing
     1780the exact same things)
     1781- one that is planet-dependent i.e. time settings, planetary constants
     1782
     1783now the planet-independent initialization is done by inigeomphy_mod
     1784which is in dynphy_lonlat and the planet-dependent initialization is done
     1785in the respective phyxxx folders
     1786
     1787this commit is intended for interface lisibility and modular approach
     1788following the framework adopted by Ehouarn in the last commits
     1789it paves the path for a similar (and, now, easy) counterpart for mesoscale
     1790models
  • TabularUnified trunk/LMDZ.COMMON/libf/dyn3d/leapfrog.F

    r1549 r1564  
    211211      real :: dtec
    212212      real :: ztetaec(ip1jmp1,llm)
    213 
    214 c dummy: sinon cette routine n'est jamais compilee...
    215       if(1.eq.0) then
    216 #ifdef CPP_PHYS
    217         CALL init_phys_lmdz(iim,jjp1,llm,1,(/(jjm-1)*iim+2/))
    218 #endif
    219       endif
    220213
    221214      if (nday>=0) then
  • TabularUnified trunk/LMDZ.COMMON/libf/dyn3dpar/leapfrog_p.F

    r1549 r1564  
    222222      LOGICAL :: ok_start_timer=.FALSE.
    223223      LOGICAL, SAVE :: firstcall=.TRUE.
    224 
    225 c dummy: sinon cette routine n'est jamais compilee...
    226       if(1.eq.0) then
    227 #ifdef CPP_PHYS
    228         CALL init_phys_lmdz(iim,jjp1,llm,1,(/(jjm-1)*iim+2/))
    229 #endif
    230       endif
    231224
    232225c$OMP MASTER
  • TabularUnified trunk/LMDZ.COMMON/libf/dynphy_lonlat/inigeomphy_mod.F90

    r1563 r1564  
    1 MODULE inigeom_mod
     1MODULE inigeomphy_mod
    22
    33CONTAINS
    44
    5 SUBROUTINE inigeom(iim,jjm,nlayer, &
     5SUBROUTINE inigeomphy(iim,jjm,nlayer, &
    66                     nbp, communicator, &
    77                     rlatu,rlatv,rlonu,rlonv,aire,cu,cv)
     
    227227
    228228
    229 END SUBROUTINE inigeom
    230 
    231 END MODULE inigeom_mod
     229END SUBROUTINE inigeomphy
     230
     231END MODULE inigeomphy_mod
  • TabularUnified trunk/LMDZ.COMMON/libf/dynphy_lonlat/phytitan/iniphysiq_mod.F90

    r1563 r1564  
    1515  USE temps_mod, ONLY: annee_ref, day_ref, day_ini, day_end
    1616  USE time_phylmdz_mod, ONLY: init_time
     17  USE inigeomphy_mod, ONLY: inigeomphy
     18  USE control_mod, ONLY: nday
    1719  IMPLICIT NONE
    1820
     
    5254  !------------------------------------------
    5355  ! --> initialize physics distribution, global fields and geometry
    54   CALL inigeom(ii,jj,nlayer, &
     56  CALL inigeomphy(ii,jj,nlayer, &
    5557               nbp, communicator, &
    5658               rlatudyn,rlatvdyn, &
  • TabularUnified trunk/LMDZ.COMMON/libf/dynphy_lonlat/phyvenus/iniphysiq_mod.F90

    r1563 r1564  
    1515  USE temps_mod, ONLY: annee_ref, day_ref, day_ini, day_end
    1616  USE time_phylmdz_mod, ONLY: init_time
     17  USE inigeomphy_mod, ONLY: inigeomphy
    1718  IMPLICIT NONE
    1819
     
    5253  !------------------------------------------
    5354  ! --> initialize physics distribution, global fields and geometry
    54   CALL inigeom(ii,jj,nlayer, &
     55  CALL inigeomphy(ii,jj,nlayer, &
    5556               nbp, communicator, &
    5657               rlatudyn,rlatvdyn, &
  • TabularUnified trunk/LMDZ.GENERIC/README

    r1549 r1564  
    12181218== 06/05/2016 == EM
    12191219- turn physiq.F90 into module physiq_mod.F90
     1220
     1221== 20/05/2016 == AS+EM
     1222- cleanup around iniphysiq: separate things between planet-independent
     1223  initializations (now done by inigeomphy in dynphy_lonlat) and
     1224  mosre physics-package specific things (remain in iniphysiq).
  • TabularUnified trunk/LMDZ.GENERIC/libf/dynphy_lonlat/phystd/iniphysiq_mod.F90

    r1563 r1564  
    1818use ioipsl_getin_p_mod, only: getin_p
    1919
    20 
     20use inigeomphy_mod, only: inigeomphy
    2121use geometry_mod, only: cell_area, & ! physics grid area (m2)
    2222                        longitude, & ! longitudes (rad)
     
    5757  !------------------------------------------
    5858  ! --> initialize physics distribution, global fields and geometry
    59   CALL inigeom(ii,jj,nlayer, &
     59  CALL inigeomphy(ii,jj,nlayer, &
    6060               nbp, communicator, &
    6161               rlatudyn,rlatvdyn, &
  • TabularUnified trunk/LMDZ.MARS/README

    r1560 r1564  
    22982298  writediagfi) or else outputs are always single precision.
    22992299
     2300== 20/05/2016 == AS+EM
     2301- cleanup around iniphysiq: separate things between planet-independent
     2302  initializations (now done by inigeomphy in dynphy_lonlat) and
     2303  mosre physics-package specific things (remain in iniphysiq).
     2304
     2305 
  • TabularUnified trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/iniphysiq_mod.F90

    r1563 r1564  
    1414use temps_mod, only: day_ini, hour_ini
    1515use phys_state_var_init_mod, only: phys_state_var_init
    16 
     16use inigeomphy_mod, only: inigeomphy
    1717use geometry_mod, only: cell_area, & ! physics grid area (m2)
    1818                        longitude, & ! longitudes (rad)
     
    4949  !------------------------------------------
    5050  ! --> initialize physics distribution, global fields and geometry
    51   CALL inigeom(ii,jj,nlayer, &
     51  CALL inigeomphy(ii,jj,nlayer, &
    5252               nbp, communicator, &
    5353               rlatudyn,rlatvdyn, &
Note: See TracChangeset for help on using the changeset viewer.