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/LMDZ.COMMON/libf
Files:
4 edited
1 moved

Legend:

Unmodified
Added
Removed
  • 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
  • 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
  • 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
  • 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, &
  • 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, &
Note: See TracChangeset for help on using the changeset viewer.