Changeset 1539 for trunk/LMDZ.GENERIC/libf/phystd/dyn1d

Timestamp:

Apr 12, 2016, 4:12:59 PM (9 years ago)

Author:

mturbet

Message:

minor bugs in rcm1D related to nsoilmx declaration order

File:

• trunk/LMDZ.GENERIC/libf/phystd/dyn1d/rcm1d.F (modified) (4 diffs)

trunk/LMDZ.GENERIC/libf/phystd/dyn1d/rcm1d.F

@@ -71 +71 @@
 c
       INTEGER day0          ! date initial (sol ; =0 a Ls=0)
-      REAL day           ! date durant le run
+      REAL day              ! date durant le run
       REAL time             ! time (0<time<1 ; time=0.5 a midi)
-      REAL play(llm)   ! Pressure at the middle of the layers (Pa)
-      REAL plev(llm+1) ! intermediate pressure levels (pa)
+      REAL play(llm)        ! Pressure at the middle of the layers (Pa)
+      REAL plev(llm+1)      ! intermediate pressure levels (pa)
       REAL psurf,tsurf(1)      
-      REAL u(llm),v(llm)  ! zonal, meridional wind
-      REAL gru,grv   ! prescribed "geostrophic" background wind
-      REAL temp(llm)   ! temperature at the middle of the layers
-      REAL,ALLOCATABLE :: q(:,:) ! tracer mixing ratio (e.g. kg/kg)
-      REAL,ALLOCATABLE :: qsurf(:)      ! tracer surface budget (e.g. kg.m-2)
-      REAL tsoil(nsoilmx)   ! subsurface soik temperature (K)
-!      REAL co2ice           ! co2ice layer (kg.m-2) !not used anymore
-      integer :: i_co2_ice=0  ! tracer index of co2 ice
-      integer :: i_h2o_ice=0  ! tracer index of h2o ice
-      integer :: i_h2o_vap=0  ! tracer index of h2o vapor
-      REAL emis(1)             ! surface layer
-      REAL q2(llm+1)   ! Turbulent Kinetic Energy
-      REAL zlay(llm)   ! altitude estimee dans les couches (km)
+      REAL u(llm),v(llm)    ! zonal, meridional wind
+      REAL gru,grv          ! prescribed "geostrophic" background wind
+      REAL temp(llm)        ! temperature at the middle of the layers
+      REAL,ALLOCATABLE :: q(:,:)      ! tracer mixing ratio (e.g. kg/kg)
+      REAL,ALLOCATABLE :: qsurf(:)    ! tracer surface budget (e.g. kg.m-2)
+      REAL,ALLOCATABLE :: tsoil(:)    ! subsurface soil temperature (K)
+!      REAL co2ice               ! co2ice layer (kg.m-2) !not used anymore
+      integer :: i_co2_ice=0     ! tracer index of co2 ice
+      integer :: i_h2o_ice=0     ! tracer index of h2o ice
+      integer :: i_h2o_vap=0     ! tracer index of h2o vapor
+      REAL emis(1)               ! surface layer
+      REAL q2(llm+1)             ! Turbulent Kinetic Energy
+      REAL zlay(llm)             ! altitude estimee dans les couches (km)
 
 c    Physical and dynamical tandencies (e.g.  m.s-2, K/s, Pa/s)
@@ -159 +159 @@
       IF (.not.ALLOCATED(sinlon)) ALLOCATE(sinlon(1))
       IF (.not.ALLOCATED(coslon)) ALLOCATE(coslon(1))
-      !! those are defined in comsoil_h.F90
-      IF (.not.ALLOCATED(layer)) ALLOCATE(layer(nsoilmx))
-      IF (.not.ALLOCATED(mlayer)) ALLOCATE(mlayer(0:nsoilmx-1))
-      IF (.not.ALLOCATED(inertiedat)) ALLOCATE(inertiedat(1,nsoilmx))
       !! those are defined in comgeomfi_h
       IF (.not. ALLOCATED(lati)) ALLOCATE(lati(1))
@@ -474 +470 @@
       nlayer=llm
       nlevel=nlayer+1
-      nsoil=nsoilmx
 
       day_step=48 ! default value for day_step
@@ -517 +512 @@
       CALL inifis(1,llm,nq,day0,daysec,nday,dtphys,
      .            latitude,longitude,area,rad,g,r,cpp)
+
+      nsoil=nsoilmx
+      allocate(tsoil(nsoilmx))
+      !! those are defined in comsoil_h.F90
+      IF (.not.ALLOCATED(layer)) ALLOCATE(layer(nsoilmx))
+      IF (.not.ALLOCATED(mlayer)) ALLOCATE(mlayer(0:nsoilmx-1))
+      IF (.not.ALLOCATED(inertiedat)) ALLOCATE(inertiedat(1,nsoilmx))
 
 ! At this point, both getin() and getin_p() functions have been used,