Changeset 1523 for trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phytitan

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.COMMON/libf/dynlonlat_phylonlat/phytitan

Files:

• iniphysiq_mod.F90 (moved) (moved from trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phytitan/iniphysiq.F90) (6 diffs)
• newstart.F (modified) (1 diff)
• startvar.F90 (modified) (4 diffs)

trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phytitan/iniphysiq_mod.F90

@@ -1 @@
-
+!
 ! $Id: iniphysiq.F90 2225 2015-03-11 14:55:23Z emillour $
-
+!
+MODULE iniphysiq_mod
+
+CONTAINS
 
 SUBROUTINE iniphysiq(iim,jjm,nlayer,punjours, pdayref,ptimestep,         &
-                     rlatu,rlonv,aire,cu,cv,                             &
+                     rlatu,rlatv,rlonu,rlonv,aire,cu,cv,                 &
                      prad,pg,pr,pcpp,iflag_phys)
   USE dimphy, ONLY: klev ! number of atmospheric levels
@@ -19 +22 @@
                         rlond, & ! longitudes
                         rlatd ! latitudes
+  USE regular_lonlat_mod, ONLY : init_regular_lonlat, &
+                                 east, west, north, south, &
+                                 north_east, north_west, &
+                                 south_west, south_east
+  USE nrtype, ONLY: pi
   IMPLICIT NONE
 
@@ -38 +46 @@
   INTEGER, INTENT (IN) :: jjm ! number of atompsheric columns along latitudes
   REAL, INTENT (IN) :: rlatu(jjm+1) ! latitudes of the physics grid
+  REAL, INTENT (IN) :: rlatv(jjm) ! latitude boundaries of the physics grid
   REAL, INTENT (IN) :: rlonv(iim+1) ! longitudes of the physics grid
+  REAL, INTENT (IN) :: rlonu(iim+1) ! longitude boundaries of the physics grid
   REAL, INTENT (IN) :: aire(iim+1,jjm+1) ! area of the dynamics grid (m2)
   REAL, INTENT (IN) :: cu((iim+1)*(jjm+1)) ! cu coeff. (u_covariant = cu * u)
@@ -52 +62 @@
   REAL :: total_area_phy, total_area_dyn
 
+  ! boundaries, on global grid
+  REAL,ALLOCATABLE :: boundslon_reg(:,:)
+  REAL,ALLOCATABLE :: boundslat_reg(:,:)
 
   ! global array, on full physics grid:
@@ -66 +79 @@
     WRITE (lunout, *) 'klev   = ', klev
     abort_message = ''
-    CALL abort_gcm(modname, abort_message, 1)
+    CALL abort_gcm(modname, 'Problem with dimensions', 1)
   END IF
 
   !call init_phys_lmdz(iim,jjm+1,llm,1,(/(jjm-1)*iim+2/))
   
+  ! init regular global longitude-latitude grid points and boundaries
+  ALLOCATE(boundslon_reg(iim,2))
+  ALLOCATE(boundslat_reg(jjm+1,2))
+  
+  DO i=1,iim
+   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,jjm
+   boundslat_reg(j,north)=rlatv(j-1) 
+   boundslat_reg(j,south)=rlatv(j) 
+  ENDDO
+  boundslat_reg(jjm+1,north)= rlatv(jjm) 
+  boundslat_reg(jjm+1,south)= -PI/2
+
+  ! Write values in module regular_lonlat_mod
+  CALL init_regular_lonlat(iim,jjm+1, rlonv(1:iim), rlatu, &
+                           boundslon_reg, boundslat_reg)
+
   ! Generate global arrays on full physics grid
   ALLOCATE(latfi(klon_glo),lonfi(klon_glo),cufi(klon_glo),cvfi(klon_glo))
@@ -194 +229 @@
 
 END SUBROUTINE iniphysiq
+
+END MODULE iniphysiq_mod

trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phytitan/newstart.F

@@ -286 +286 @@
       ELSE
         CALL getin('ysinus',ysinus)
-        tab_cntrl(27) = ysinus
+        IF (ysinus) THEN
+          tab_cntrl(27) = 1
+        ELSE
+          tab_cntrl(27) = 0
+        ENDIF
       ENDIF
 

trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phytitan/startvar.F90

@@ -363 +363 @@
 SUBROUTINE start_init_orog(iml,jml,lon_in,lat_in)
       USE comconst_mod
+      USE grid_atob_m, ONLY: rugsoro
 
 !-------------------------------------------------------------------------------
@@ -427 +428 @@
   ALLOCATE(rugo   (iml  ,jml))
   ALLOCATE(tmp_var(iml-1,jml))
-  CALL rugsoro(iml_rel, jml_rel, lon_rad, lat_rad, relief_hi, iml-1, jml,      &
+  CALL rugsoro(lon_rad, lat_rad, relief_hi,      &
        lon_in, lat_in, tmp_var)
   rugo(1:iml-1,:)=tmp_var; rugo(iml,:)=tmp_var(1,:)
@@ -727 +728 @@
 
   USE inter_barxy_m, only: inter_barxy
+  USE grid_atob_m, only: grille_m
 
 ! Arguments:
@@ -757 +759 @@
     CALL inter_barxy(lon, lat(:jj-1), vari, lon2(:i1-1), lat2(:j2), vtmp)
   ELSE
-    CALL grille_m   (ii, jj,   lon, lat, vari, i1-1, j1, lon1, lat1,     vtmp)
+    CALL grille_m   (lon, lat, vari, lon1, lat1, vtmp)
   END IF
   CALL gr_int_dyn(vtmp, varo, i1-1, j1)