Changeset 2669 for LMDZ5/branches/testing/libf/dynphy_lonlat

Timestamp:

Oct 14, 2016, 2:57:28 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2640:2664 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dynphy_lonlat/phydev/callphysiq_mod.F90 (modified) (2 diffs)
• libf/dynphy_lonlat/phylmd/etat0phys_netcdf.F90 (modified) (2 diffs)
• libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90 (modified) (8 diffs)

LMDZ5/branches/testing/libf/dynphy_lonlat/phydev/callphysiq_mod.F90

@@ -12 +12 @@
                        jD_cur,jH_cur_split,zdt_split,                     &
                        zplev_omp,zplay_omp,                               &
-                       zphi_omp,zphis_omp,                                &
+                       zpk_omp,zphi_omp,zphis_omp,                        &
                        presnivs_omp,                                      &
                        zufi_omp,zvfi_omp,zrfi_omp,ztfi_omp,zqfi_omp,      &
@@ -34 +34 @@
   REAL,INTENT(IN) :: zplev_omp(klon,llm+1) ! interlayer pressure (Pa)
   REAL,INTENT(IN) :: zplay_omp(klon,llm) ! mid-layer pressure (Pa)
+  REAL,INTENT(IN) :: zpk_omp(klon,llm) ! Exner function
   REAL,INTENT(IN) :: zphi_omp(klon,llm) ! geopotential at midlayer
   REAL,INTENT(IN) :: zphis_omp(klon) ! surface geopotential

LMDZ5/branches/testing/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.F90

@@ -111 +111 @@
   INTEGER :: flag_aerosol
   INTEGER :: flag_aerosol_strat
+  LOGICAL :: flag_bc_internal_mixture
   LOGICAL :: new_aod
   REAL    :: bl95_b0, bl95_b1
@@ -131 +132 @@
                    ok_ade, ok_aie, ok_cdnc, aerosol_couple,             &
                    flag_aerosol, flag_aerosol_strat, new_aod,           &
-                   bl95_b0, bl95_b1,                                    &
+                   flag_bc_internal_mixture, bl95_b0, bl95_b1,          &
                    read_climoz,                                         &
                    alp_offset)

LMDZ5/branches/testing/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90

@@ -9 +9 @@
                      nbp, communicator, &
                      punjours, pdayref,ptimestep, &
-                     rlatu,rlatv,rlonu,rlonv,aire,cu,cv,       &
+                     rlatudyn,rlatvdyn,rlonudyn,rlonvdyn,airedyn,cudyn,cvdyn, &
                      prad,pg,pr,pcpp,iflag_phys)
   USE dimphy, ONLY: init_dimphy
@@ -44 +44 @@
   USE mod_phys_lmdz_omp_data, ONLY: klon_omp 
 #endif
+  USE ioipsl_getin_p_mod, ONLY: getin_p
+  USE slab_heat_transp_mod, ONLY: ini_slab_transp_geom
   IMPLICIT NONE
 
@@ -52 +54 @@
 
   include "dimensions.h"
+  include "paramet.h"
   include "iniprint.h"
   include "tracstoke.h"
+  include "comgeom.h"
 
   REAL, INTENT (IN) :: prad ! radius of the planet (m)
@@ -65 +69 @@
   INTEGER, INTENT(IN) :: nbp ! number of physics columns for this MPI process
   INTEGER, INTENT(IN) :: communicator ! MPI communicator
-  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)
-  REAL, INTENT (IN) :: cv((ii+1)*jj) ! cv coeff. (v_covariant = cv * v)
+  REAL, INTENT (IN) :: rlatudyn(jj+1) ! latitudes of the physics grid
+  REAL, INTENT (IN) :: rlatvdyn(jj) ! latitude boundaries of the physics grid
+  REAL, INTENT (IN) :: rlonvdyn(ii+1) ! longitudes of the physics grid
+  REAL, INTENT (IN) :: rlonudyn(ii+1) ! longitude boundaries of the physics grid
+  REAL, INTENT (IN) :: airedyn(ii+1,jj+1) ! area of the dynamics grid (m2)
+  REAL, INTENT (IN) :: cudyn((ii+1)*(jj+1)) ! cu coeff. (u_covariant = cu * u)
+  REAL, INTENT (IN) :: cvdyn((ii+1)*jj) ! cv coeff. (v_covariant = cv * v)
   INTEGER, INTENT (IN) :: pdayref ! reference day of for the simulation
   REAL, INTENT (IN) :: ptimestep !physics time step (s)
@@ -80 +84 @@
   CHARACTER (LEN=20) :: modname = 'iniphysiq'
   CHARACTER (LEN=80) :: abort_message
-
+  
+  LOGICAL :: slab_hdiff
+  INTEGER :: slab_ekman
+  CHARACTER (LEN = 6) :: type_ocean 
 
 #ifndef CPP_PARA
@@ -92 +99 @@
   CALL inigeomphy(ii,jj,nlayer, &
                nbp, communicator, &
-               rlatu,rlatv, &
-               rlonu,rlonv, &
-               aire,cu,cv)
+               rlatudyn,rlatvdyn, &
+               rlonudyn,rlonvdyn, &
+               airedyn,cudyn,cvdyn)
 
   ! --> now initialize things specific to the phylmd physics package
@@ -117 +124 @@
   ! Copy over "offline" settings
   CALL init_phystokenc(offline,istphy)
+
+  ! Initialization for slab heat transport
+  type_ocean="force"
+  CALL getin_p('type_ocean',type_ocean)
+  slab_hdiff=.FALSE.
+  CALL getin_p('slab_hdiff',slab_hdiff)
+  slab_ekman=0
+  CALL getin_p('slab_ekman',slab_ekman)
+  IF ((type_ocean=='slab').AND.(slab_hdiff.OR.(slab_ekman.GT.0))) THEN
+     CALL ini_slab_transp_geom(ip1jm,ip1jmp1,unsairez,fext,unsaire,&
+                                  cu,cuvsurcv,cv,cvusurcu, &
+                                  aire,apoln,apols, &
+                                  aireu,airev) 
+  END IF
 
   ! Initialize tracer names, numbers, etc. for physics
@@ -159 +180 @@
 #ifdef INCA
      CALL init_inca_dim(klon_omp,nbp_lev,nbp_lon,nbp_lat - 1, &
-          rlonu,rlatu,rlonv,rlatv)
+          rlonudyn,rlatudyn,rlonvdyn,rlatvdyn)
 #endif
   END IF