Changeset 2347


Ignore:
Timestamp:
Aug 24, 2015, 9:26:48 AM (9 years ago)
Author:
Ehouarn Millour
Message:

Make iniphysiq a module.
Fix call to iniphysiq in lmdz1d (missing arguments and arrays of wrong sizes).
EM

Location:
LMDZ5/trunk/libf
Files:
1 added
1 deleted
5 edited
3 moved

Legend:

Unmodified
Added
Removed

  • LMDZ5/trunk/libf/dyn3d/gcm.F90

    r2346 r2347  
    3434  ! dynamique -> physique pour l'initialisation
    3535#ifdef CPP_PHYS
    36   !      USE dimphy
    37   !      USE comgeomphy
     36  USE iniphysiq_mod, ONLY: iniphysiq
    3837#endif
    3938!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

  • LMDZ5/trunk/libf/dyn3dmem/gcm.F90

    r2346 r2347  
    2525
    2626#ifdef CPP_PHYS
    27   !      USE mod_grid_phy_lmdz
    28   !      USE mod_phys_lmdz_para, ONLY : klon_mpi_para_nb
    29   !      USE dimphy
    30   !      USE comgeomphy
     27  USE iniphysiq_mod, ONLY: iniphysiq
    3128#endif
    3229  IMPLICIT NONE

  • LMDZ5/trunk/libf/dyn3dpar/gcm.F

    r2346 r2347  
    3030
    3131#ifdef CPP_PHYS
    32 !      USE mod_grid_phy_lmdz
    33 !      USE mod_phys_lmdz_para, ONLY : klon_mpi_para_nb
    34 !      USE dimphy
    35 !      USE comgeomphy
     32  USE iniphysiq_mod, ONLY: iniphysiq
    3633#endif
    3734      IMPLICIT NONE

  • LMDZ5/trunk/libf/dynlonlat_phylonlat/phydev/iniphysiq_mod.F90

    r2346 r2347  
    22! $Id: iniphysiq.F 1403 2010-07-01 09:02:53Z fairhead $
    33!
     4MODULE iniphysiq_mod
     5
     6CONTAINS
     7
    48SUBROUTINE iniphysiq(iim,jjm,nlayer,punjours, pdayref,ptimestep, &
    59                     rlatu,rlatv,rlonu,rlonv,aire,cu,cv, &
    … …  
    177181
    178182END SUBROUTINE iniphysiq
     183
     184END MODULE iniphysiq_mod

  • LMDZ5/trunk/libf/dynlonlat_phylonlat/phylmd/iniphysiq_mod.F90

    r2346 r2347  
    1 
     1!
    22! $Id$
    3 
     3!
     4MODULE iniphysiq_mod
     5
     6CONTAINS
    47
    58SUBROUTINE iniphysiq(ii,jj,nlayer,punjours, pdayref,ptimestep, &
    … …  
    211214
    212215END SUBROUTINE iniphysiq
     216
     217END MODULE iniphysiq_mod

  • LMDZ5/trunk/libf/dynlonlat_phylonlat/phymar/iniphysiq_mod.F90

    r2346 r2347  
    22! $Id: iniphysiq.F 1403 2010-07-01 09:02:53Z fairhead $
    33!
     4MODULE iniphysiq_mod
     5
     6CONTAINS
     7
    48SUBROUTINE iniphysiq(iim,jjm,nlayer,punjours, pdayref,ptimestep, &
    59                     rlatu,rlatv,rlonu,rlonv,aire,cu,cv,         &
    … …  
    186190!!$OMP END PARALLEL
    187191
    188       END
     192END SUBROUTINE iniphysiq
     193
     194END MODULE iniphysiq_mod

  • LMDZ5/trunk/libf/phylmd/dyn1d/1DUTILS.h

    r2311 r2347  
    11#include "conf_gcm.F90"
    2 #include "q_sat.F"
    32
    43!

  • LMDZ5/trunk/libf/phylmd/dyn1d/lmdz1d.F90

    r2335 r2347  
    2323      USE mod_1D_amma_read
    2424      USE print_control_mod, ONLY: prt_level
     25      USE iniphysiq_mod, ONLY: iniphysiq
    2526
    2627      implicit none
    … …  
    619620      zcvfi=airefi
    620621!
    621       rlat_rad(:)=rlat(:)*rpi/180.
    622       rlon_rad(:)=rlon(:)*rpi/180.
    623 
    624       call iniphysiq(iim,jjm,llm,rday,day_ini,timestep,                        &
    625      &     rlat_rad,rlon_rad,airefi,zcufi,zcvfi,ra,rg,rd,rcpd,(/1/))
     622      rlat_rad(1)=rlat(1)*rpi/180.
     623      rlon_rad(1)=rlon(1)*rpi/180.
     624
     625     ! Ehouarn: iniphysiq requires arrays related to (3D) dynamics grid,
     626     ! e.g. for cell boundaries, which are meaningless in 1D; so pad these
     627     ! with '0.' when necessary
     628      call iniphysiq(iim,jjm,llm,rday,day_ini,timestep,  &
     629           (/rlat_rad(1),0./),(/0./), &
     630           (/0.,0./),(/rlon_rad(1),0./),  &
     631           (/ (/airefi,0./),(/0.,0./) /), &
     632           (/zcufi,0.,0.,0./), &
     633           (/zcvfi,0./), &
     634           ra,rg,rd,rcpd,1)
    626635      print*,'apres iniphysiq'
    627636
Note: See TracChangeset for help on using the changeset viewer.