Changeset 1523 for trunk/LMDZ.MARS

Timestamp:

Mar 28, 2016, 5:27:51 PM (9 years ago)

Author:

emillour

Message:

All models: More updates to make planetary codes (+Earth) setups converge.

• in dyn3d_common:
• convmas.F => convmas.F90
• enercin.F => enercin.F90
• flumass.F => flumass.F90
• massbar.F => massbar.F90
• tourpot.F => tourpot.F90
• vitvert.F => vitvert.F90

• in misc:
• move "q_sat" from "dyn3d_common" to "misc" (in Earth model, it is also called by the physics)
• move "write_field" from "dyn3d_common" to "misc"(may be called from physics or dynamics and depends on neither).

• in phy_common:
• move "write_field_phy" here since it may be called from any physics package)
• add module "regular_lonlat_mod" to store global information on lon-lat grid

• in dynlonlat_phylonlat/phy*:
• turn "iniphysiq.F90" into module "iniphysiq_mod.F90" (and of course adapt gcm.F[90] and 1D models accordingly)

EM

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (1 diff)
• libf/dyn3d/gcm.F (modified) (2 diffs)
• libf/dynlonlat_phylonlat/phymars/iniphysiq_mod.F90 (moved) (moved from trunk/LMDZ.MARS/libf/dynlonlat_phylonlat/phymars/iniphysiq.F90) (7 diffs)
• libf/phy_common/regular_lonlat_mod.F90 (added)

trunk/LMDZ.MARS/README

@@ -2219 +2219 @@
 - Adapted "create_make_gcm" and "makegcm*" scripts accordingly
   (deleted obsolete makegcm_g95)
+
+== 28/03/2016 == EM
+- Added module "regular_lonlat_mod.F90" (to store information on global
+  lon-lat grid) in phy_common.
+- Turned iniphysiq (in dynlonlat_phylonlat/phymars)into module
+  "iniphysiq_mod.F90".

trunk/LMDZ.MARS/libf/dyn3d/gcm.F

@@ -12 +12 @@
      .          apdiss,purmats,physic,apphys
       USE temps_mod, ONLY: day_ini,day_end,dt,itaufin
+      USE iniphysiq_mod, ONLY: iniphysiq
       IMPLICIT NONE
 
@@ -254 +255 @@
 !         CALL iniphysiq(iim,jjm,llm,daysec,day_ini,dtphys/nsplit_phys,
          CALL iniphysiq(iim,jjm,llm,daysec,day_ini,dtphys,
-     &                rlatu,rlonv,aire,cu,cv,rad,g,r,cpp,
-     &                1)
+     &                  rlatu,rlatv,rlonu,rlonv,
+     &                  aire,cu,cv,rad,g,r,cpp,
+     &                  1)
 !     &                iflag_phys)
 !#endif

trunk/LMDZ.MARS/libf/dynlonlat_phylonlat/phymars/iniphysiq_mod.F90

@@ +1 @@
+MODULE iniphysiq_mod
+
+CONTAINS
+
 subroutine iniphysiq(ii,jj,nlayer,punjours, pdayref,ptimestep,           &
-                     rlatu,rlonv,aire,cu,cv,                             &
+                     rlatu,rlatv,rlonu,rlonv,aire,cu,cv,                 &
                      prad,pg,pr,pcpp,iflag_phys)
 
@@ -19 +23 @@
 use infotrac, only : nqtot ! number of advected tracers
 use comgeomfi_h, only: ini_fillgeom
+use regular_lonlat_mod, only: init_regular_lonlat, &
+                              east, west, north, south, &
+                              north_east, north_west, &
+                              south_west, south_east
 
 implicit none
@@ -33 +41 @@
 integer,intent(in) :: ii ! number of atmospheric coulumns along longitudes
 integer,intent(in) :: jj  ! number of atompsheric columns along latitudes
-real,intent(in) :: rlatu(jj+1) ! latitudes of the dynamics U grid
-real,intent(in) :: rlonv(ii+1) ! longitudes of the dynamics V grid
+real,intent(in) :: rlatu(jj+1) ! latitudes of the physics grid
+real,intent(in) :: rlatv(jj) ! latitude boundaries of the physics grid
+real,intent(in) :: rlonv(ii+1) ! longitudes of the physics grid
+real,intent(in) :: rlonu(ii+1) ! longitude boundaries of the physics grid
 real,intent(in) :: aire(ii+1,jj+1) ! area of the dynamics grid (m2)
 real,intent(in) :: cu((ii+1)*(jj+1)) ! cu coeff. (u_covariant = cu * u)
@@ -47 +57 @@
 character(len=80) :: abort_message
 real :: total_area_phy, total_area_dyn
+real :: pi
 
+! boundaries, on global grid
+real,allocatable :: boundslon_reg(:,:)
+real,allocatable :: boundslat_reg(:,:)
 
 ! global array, on full physics grid:
@@ -55 +69 @@
 real,allocatable :: cvfi(:)
 real,allocatable :: airefi(:)
+
+pi=2.*asin(1.0)
 
 IF (nlayer.NE.klev) THEN
@@ -73 +89 @@
 !  CALL abort_gcm (modname,abort_message,1)
 !ENDIF
+
+! init regular global longitude-latitude grid points and boundaries
+ALLOCATE(boundslon_reg(ii,2))
+ALLOCATE(boundslat_reg(jj+1,2))
+  
+DO i=1,ii
+   boundslon_reg(i,east)=rlonu(i) 
+   boundslon_reg(i,west)=rlonu(i+1) 
+ENDDO
+
+boundslat_reg(1,north)= PI/2 
+boundslat_reg(1,south)= rlatv(1)
+DO j=2,jj
+   boundslat_reg(j,north)=rlatv(j-1) 
+   boundslat_reg(j,south)=rlatv(j) 
+ENDDO
+boundslat_reg(jj+1,north)= rlatv(jj) 
+boundslat_reg(jj+1,south)= -PI/2
+
+! Write values in module regular_lonlat_mod
+CALL init_regular_lonlat(ii,jj+1, rlonv(1:ii), rlatu, &
+                         boundslon_reg, boundslat_reg)
 
 ! Generate global arrays on full physics grid
@@ -141 +179 @@
 
 end subroutine iniphysiq
+
+
+END MODULE iniphysiq_mod