Changeset 1538 for trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/phystd

Timestamp:

Apr 8, 2016, 4:57:00 PM (9 years ago)

Author:

emillour

Message:

Generic GCM:

• Made nsoilmx be no longer a "parameter" and thus added the possibility to define the number of subsurface layers nsoilmx, along with first layer thickness "lay1_soil" and companion coefficient "alpha_soil", in callphys.def at run time. As before (when these were hard-coded), these are such that the depth of soil mid-layers are: mlayer(k)=lay1_soil*alpha_soil(k-1/2), for k=0,nsoil-1

EM

Location:

trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/phystd

Files:

• newstart.F (modified) (6 diffs)
• start2archive.F (modified) (4 diffs)

trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/phystd/newstart.F

@@ -36 +36 @@
       USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
       use inifis_mod, only: inifis
+      use control_mod, only: nday 
       implicit none
 
@@ -95 +96 @@
 c------------------
       REAL tsurf(ngridmx)       ! surface temperature
-      REAL tsoil(ngridmx,nsoilmx) ! soil temperature
+      REAL,ALLOCATABLE :: tsoil(:,:) ! soil temperature
 !      REAL co2ice(ngridmx)     ! CO2 ice layer
       REAL emis(ngridmx)        ! surface emissivity
@@ -103 +104 @@
 !      REAL rnaturfi(ngridmx)
       real alb(iip1,jjp1),albfi(ngridmx) ! albedos
-      real ith(iip1,jjp1,nsoilmx),ithfi(ngridmx,nsoilmx) ! thermal inertia (3D)
+      real,allocatable :: ith(:,:,:),ithfi(:,:) ! thermal inertia (3D)
       real surfith(iip1,jjp1),surfithfi(ngridmx) ! surface thermal inertia (2D)
       REAL latfi(ngridmx),lonfi(ngridmx),airefi(ngridmx)
@@ -113 +114 @@
 
       REAL rnat(ngridmx)
-      REAL tslab(ngridmx,nsoilmx) ! slab ocean temperature
+      REAL,ALLOCATABLE :: tslab(:,:) ! slab ocean temperature
       REAL pctsrf_sic(ngridmx) ! sea ice cover
       REAL tsea_ice(ngridmx) ! temperature sea_ice
@@ -274 +275 @@
 ! ... this has to be done before phyetat0
       call initracer(ngridmx,nqtot,tname)
+
+      ! default nsoilmx is set in comsoil_h
+      call getin_p("nsoilmx",nsoilmx)
+
+      ! allocate some local arrays now that we know all dimensions
+      allocate(tsoil(ngridmx,nsoilmx))
+      allocate(ith(iip1,jjp1,nsoilmx))
+      allocate(ithfi(ngridmx,nsoilmx))
+      allocate(tslab(ngridmx,nsoilmx))
 
 ! Take care of arrays in common modules
@@ -475 +485 @@
 !    (for instance initracer needs to know about some flags, and/or
 !      'datafile' path may be changed by user)
-      call inifis(ngridmx,llm,nqtot,day_ini,daysec,dtphys,
+      call inifis(ngridmx,llm,nqtot,day_ini,daysec,nday,dtphys,
      &                latfi,lonfi,airefi,rad,g,r,cpp)
 

trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/phystd/start2archive.F

@@ -19 +19 @@
 c=======================================================================
 
+      use ioipsl_getin_p_mod, only: getin_p
       use infotrac, only: infotrac_init, nqtot, tname
       USE comsoil_h
@@ -69 +70 @@
 c ------------------------------------
       REAL tsurf(ngridmx)       ! Surface temperature
-      REAL tsoil(ngridmx,nsoilmx) ! Soil temperature
+      REAL,ALLOCATABLE :: tsoil(:,:) ! Soil temperature
       REAL co2ice(ngridmx)      ! CO2 ice layer
       REAL q2(ngridmx,llm+1)
@@ -93 +94 @@
       REAL T(ip1jmp1,llm),us(ip1jmp1,llm),vs(ip1jmp1,llm)
       REAL tsurfS(ip1jmp1)
-      REAL tsoilS(ip1jmp1,nsoilmx)
-      REAL ithS(ip1jmp1,nsoilmx) ! Soil Thermal Inertia
+      REAL,ALLOCATABLE :: tsoilS(:,:)
+      REAL,ALLOCATABLE :: ithS(:,:) ! Soil Thermal Inertia
       REAL co2iceS(ip1jmp1)
       REAL q2S(ip1jmp1,llm+1)
@@ -147 +148 @@
       CALL init_phys_lmdz(iim,jjp1,llm,1,(/(jjm-1)*iim+2/))
       call initcomgeomphy
+
+! get value of nsoilmx (default is set in comsoil_h)
+      call getin_p("nsoilmx",nsoilmx)
+      
+      ! allocate some local arrays now that we know all dimensions
+      allocate(tsoil(ngridmx,nsoilmx))
+      allocate(tsoilS(ip1jmp1,nsoilmx))
+      allocate(ithS(ip1jmp1,nsoilmx))
 
       ! ALLOCATE ARRAYS IN comgeomfi_h (usually done in inifis)