Changeset 242 for codes/icosagcm/branches

Timestamp:

07/21/14 12:01:59 (10 years ago)

Author:

ymipsl

Message:

calling iniphysics directly from dynamico

YM

Location:

codes/icosagcm/branches/SATURN_DYNAMICO/LMDZ.COMMON/libf

Files:

• dyn3dpar/init_gcm_lmdz.F (modified) (1 diff)
• phystd/comgeomphy.F90 (modified) (2 diffs)
• phystd/iniphysiq.F90 (modified) (5 diffs)

codes/icosagcm/branches/SATURN_DYNAMICO/LMDZ.COMMON/libf/dyn3dpar/init_gcm_lmdz.F

@@ -512 +512 @@
 !     &                iflag_phys)
 
-         zcufi(nbp)=1.
-         zcvfi(nbp)=1.
-
-         CALL iniphysiq(klon_glo,llm,daysec,day_ini,dtphys/nsplit_phys, 
-     &                latfi,lonfi,airefi,zcufi,zcvfi,rad,g,r,cpp, 
-     &                iflag_phys) 
+!         zcufi(nbp)=1.
+!         zcvfi(nbp)=1.
+
+!         CALL iniphysiq(klon_glo,llm,daysec,day_ini,dtphys/nsplit_phys, 
+!     &                latfi,lonfi,airefi,zcufi,zcvfi,rad,g,r,cpp, 
+!     &                iflag_phys) 
 
 #endif

codes/icosagcm/branches/SATURN_DYNAMICO/LMDZ.COMMON/libf/phystd/comgeomphy.F90

@@ -1 +1 @@
 module comgeomphy
    real,save,allocatable :: airephy(:)
-   real,save,allocatable :: cuphy(:)
-   real,save,allocatable :: cvphy(:)
    real,save,allocatable :: rlatd(:)
    real,save,allocatable :: rlond(:)
@@ -14 +12 @@
  
     allocate(airephy(klon_omp))
-    allocate(cuphy(klon_omp))
-    allocate(cvphy(klon_omp))
     allocate(rlatd(klon_omp))
     allocate(rlond(klon_omp))

codes/icosagcm/branches/SATURN_DYNAMICO/LMDZ.COMMON/libf/phystd/iniphysiq.F90

@@ -1 @@
-subroutine iniphysiq(ngrid,nlayer, punjours, pdayref,ptimestep,          &
-                     plat,plon,parea,pcu,pcv,                            &
-                     prad,pg,pr,pcpp,iflag_phys)
+subroutine iniphysiq(nlayer, punjours, pdayref,ptimestep,          &
+                     plat,plon,parea,                                    &
+                     prad,pg,pr,pcpp,                                    &
+                     preff,ap,bp)
 
 use dimphy, only : klev ! number of atmospheric levels
@@ -12 +13 @@
                                klon_mpi
 use comgeomphy, only : airephy, & ! physics grid area (m2)
-                       cuphy, & ! cu coeff. (u_covariant = cu * u)
-                       cvphy, & ! cv coeff. (v_covariant = cv * v)
                        rlond, & ! longitudes
                        rlatd ! latitudes
@@ -20 +19 @@
 
 implicit none
-include "dimensions.h"
-include "comvert.h"
 
 real,intent(in) :: prad ! radius of the planet (m)
@@ -28 +25 @@
 real,intent(in) :: pcpp ! specific heat Cp
 real,intent(in) :: punjours ! length (in s) of a standard day
-integer,intent(in) :: ngrid ! number of horizontal grid points in the physics (full grid)
 integer,intent(in) :: nlayer ! number of atmospheric layers
 real,intent(in) :: plat(klon_mpi) ! latitudes of the physics grid
 real,intent(in) :: plon(klon_mpi) ! longitudes of the physics grid
 real,intent(in) :: parea(klon_mpi) ! area (m2)
-real,intent(in) :: pcu(klon_mpi) ! cu coeff. (u_covariant = cu * u)
-real,intent(in) :: pcv(klon_mpi) ! cv coeff. (v_covariant = cv * v)
 integer,intent(in) :: pdayref ! reference day of for the simulation
-real,intent(in) :: ptimestep !physics time step (s)
-integer,intent(in) :: iflag_phys ! type of physics to be called
+real,intent(in) :: ptimestep ! physics time step (s)
+real,intent(in) :: preff      ! reference surface pressure (Pa)
+real,intent(in) :: ap(nlayer+1) ! hybrid coordinate at interfaces
+real,intent(in) :: bp(nlayer+1) ! hybrid coordinate at interfaces
 
-integer :: ibegin,iend,offset
+integer :: offset
 character(len=20) :: modname='iniphysiq'
 character(len=80) :: abort_message
@@ -52 +48 @@
 ENDIF
 
-IF (ngrid.NE.klon_glo) THEN
-  write(*,*) 'STOP in ',trim(modname)
-  write(*,*) 'Problem with dimensions :'
-  write(*,*) 'ngrid     = ',ngrid
-  write(*,*) 'klon   = ',klon_glo
-  abort_message = ''
-  CALL abort_gcm (modname,abort_message,1)
-ENDIF
 
-!$OMP PARALLEL PRIVATE(ibegin,iend) & 
-        !$OMP SHARED(parea,pcu,pcv,plon,plat)
+!$OMP PARALLEL SHARED(parea,plon,plat)
       
 offset=0
 airephy(1:klon_omp)=parea(offset+klon_omp_begin:offset+klon_omp_end)
-cuphy(1:klon_omp)=pcu(offset+klon_omp_begin:offset+klon_omp_end)
-cvphy(1:klon_omp)=pcv(offset+klon_omp_begin:offset+klon_omp_end)
 rlond(1:klon_omp)=plon(offset+klon_omp_begin:offset+klon_omp_end)
 rlatd(1:klon_omp)=plat(offset+klon_omp_begin:offset+klon_omp_end)