Changeset 1279 for LMDZ4/trunk/libf/phylmd/phys_state_var_mod.F90

Timestamp:

Dec 10, 2009, 10:02:56 AM (14 years ago)

Author:

Laurent Fairhead

Message:

Merged LMDZ4-dev branch changes r1241:1278 into the trunk
Running trunk and LMDZ4-dev in LMDZOR configuration on local
machine (sequential) and SX8 (4-proc) yields identical results
(restart and restartphy are identical binarily)
Log history from r1241 to r1278 is available by switching to
source:LMDZ4/branches/LMDZ4-dev-20091210

Location:

LMDZ4/trunk

Files:

• . (modified) (1 prop)
• libf/phylmd/phys_state_var_mod.F90 (modified) (11 diffs)

LMDZ4/trunk/libf/phylmd/phys_state_var_mod.F90

@@ -11 +11 @@
       INTEGER, PARAMETER :: napisccp=1
       INTEGER, SAVE :: radpas
-      REAL, SAVE :: dtime, co2_ppm_etat0, solaire_etat0
+      REAL, SAVE :: dtime, solaire_etat0
 !$OMP THREADPRIVATE(radpas)
-!$OMP THREADPRIVATE(dtime, co2_ppm_etat0, solaire_etat0)
+!$OMP THREADPRIVATE(dtime, solaire_etat0)
 
       REAL, ALLOCATABLE, SAVE :: rlat(:), rlon(:), pctsrf(:,:)
@@ -202 +202 @@
       REAL,ALLOCATABLE,SAVE :: albsol1(:), albsol2(:)
 !$OMP THREADPRIVATE(albsol1,albsol2)
-      REAL,ALLOCATABLE,SAVE :: wo(:,:)
-!$OMP THREADPRIVATE(wo)
-!
+
+      REAL, ALLOCATABLE, SAVE:: wo(:, :, :)
+      ! column-density of ozone in a layer, in kilo-Dobsons
+      ! Third dimension has size 1 or 2.
+      ! "wo(:, :, 1)" is for the average day-night field, 
+      ! "wo(:, :, 2)" is for daylight time.
+      !$OMP THREADPRIVATE(wo)
+
 ! heat : chauffage solaire
 ! heat0: chauffage solaire ciel clair
@@ -255 +260 @@
 !$OMP THREADPRIVATE(snow_con)
 !
-! sulfate_pi : SO4 aerosol concentration [ug/m3] (pre-industrial value)
-
-      REAL,SAVE,ALLOCATABLE :: sulfate_pi(:, :)
-!$OMP THREADPRIVATE(sulfate_pi)
       REAL,SAVE,ALLOCATABLE :: rlonPOS(:)
 !$OMP THREADPRIVATE(rlonPOS)
@@ -269 +270 @@
 ! ok_aie=T ->
 !       ok_ade=T -AIE=topswai-topswad
-!        ok_ade=F -AIE=topswai-topsw
+!       ok_ade=F -AIE=topswai-topsw
 !
 !topswad, solswad : Aerosol direct effect
@@ -277 +278 @@
       REAL,SAVE,ALLOCATABLE :: topswai(:), solswai(:)
 !$OMP THREADPRIVATE(topswai,solswai)
-      REAL,SAVE,ALLOCATABLE :: tau_ae(:,:,:), piz_ae(:,:,:)
-!$OMP THREADPRIVATE(tau_ae,piz_ae)
-      REAL,SAVE,ALLOCATABLE :: cg_ae(:,:,:)
-!$OMP THREADPRIVATE(cg_ae)
-
-! Les variables suivants uniquement pour un configuration avec INCA
-! topswad_inca, solswad_inca : Aerosol direct effect
-      REAL,SAVE,ALLOCATABLE :: topswad_inca(:), solswad_inca(:)
-!$OMP THREADPRIVATE(topswad_inca,solswad_inca)
-! topswad0_inca, solswad0_inca : Aerosol direct effect
-      REAL,SAVE,ALLOCATABLE :: topswad0_inca(:), solswad0_inca(:)
-!$OMP THREADPRIVATE(topswad0_inca,solswad0_inca)
-! topswai_inca, solswai_inca : Aerosol indirect effect
-      REAL,SAVE,ALLOCATABLE :: topswai_inca(:), solswai_inca(:)
-!$OMP THREADPRIVATE(topswai_inca,solswai_inca)
-      REAL,SAVE,ALLOCATABLE :: topsw_inca(:,:), solsw_inca(:,:)
-!$OMP THREADPRIVATE(topsw_inca,solsw_inca)
-      REAL,SAVE,ALLOCATABLE :: topsw0_inca(:,:), solsw0_inca(:,:)
-!$OMP THREADPRIVATE(topsw0_inca,solsw0_inca)
-      REAL,SAVE,ALLOCATABLE :: tau_inca(:,:,:,:)
-!$OMP THREADPRIVATE(tau_inca)
-      REAL,SAVE,ALLOCATABLE :: piz_inca(:,:,:,:)
-!$OMP THREADPRIVATE(piz_inca)
-      REAL,SAVE,ALLOCATABLE :: cg_inca(:,:,:,:)
-!$OMP THREADPRIVATE(cg_inca)
+
+      REAL,SAVE,ALLOCATABLE :: tau_aero(:,:,:,:), piz_aero(:,:,:,:), cg_aero(:,:,:,:)
+!$OMP THREADPRIVATE(tau_aero, piz_aero, cg_aero)
       REAL,SAVE,ALLOCATABLE :: ccm(:,:,:)
 !$OMP THREADPRIVATE(ccm)
@@ -308 +287 @@
 
 !======================================================================
-SUBROUTINE phys_state_var_init
+SUBROUTINE phys_state_var_init(read_climoz)
 use dimphy
+use aero_mod
 IMPLICIT NONE
+
+integer, intent(in)::  read_climoz
+! read ozone climatology
+! Allowed values are 0, 1 and 2
+! 0: do not read an ozone climatology
+! 1: read a single ozone climatology that will be used day and night
+! 2: read two ozone climatologies, the average day and night
+! climatology and the daylight climatology
+
 #include "indicesol.h"
 #include "control.h"
@@ -388 +377 @@
       ALLOCATE(paire_ter(klon))
       ALLOCATE(albsol1(klon), albsol2(klon))
-      ALLOCATE(wo(klon,klev))
+
+      if (read_climoz <= 1) then
+         ALLOCATE(wo(klon,klev, 1))
+      else
+         ! read_climoz == 2
+         ALLOCATE(wo(klon,klev, 2))
+      end if
+      
       ALLOCATE(clwcon0(klon,klev),rnebcon0(klon,klev))
       ALLOCATE(heat(klon,klev), heat0(klon,klev)) 
@@ -402 +398 @@
       ALLOCATE(ibas_con(klon), itop_con(klon))
       ALLOCATE(rain_con(klon), snow_con(klon))
-!
-      ALLOCATE(sulfate_pi(klon, klev))
       ALLOCATE(rlonPOS(klon))
       ALLOCATE(newsst(klon))
@@ -409 +403 @@
       ALLOCATE(topswad(klon), solswad(klon))
       ALLOCATE(topswai(klon), solswai(klon))
-      ALLOCATE(tau_ae(klon,klev,2), piz_ae(klon,klev,2))
-      ALLOCATE(cg_ae(klon,klev,2))
-
-      IF (config_inca /= 'none') THEN
-         ALLOCATE(topswad_inca(klon), solswad_inca(klon))
-         ALLOCATE(topswad0_inca(klon), solswad0_inca(klon))
-         ALLOCATE(topswai_inca(klon), solswai_inca(klon))
-         ALLOCATE(topsw_inca(klon,9), solsw_inca(klon,9))
-         ALLOCATE(topsw0_inca(klon,9), solsw0_inca(klon,9))
-      END IF
-      ! Following 4 variables are needed only by INCA but must be
-      ! allocated as they exist in the phytrac argument list
-      ALLOCATE(tau_inca(klon,klev,9,2))
-      ALLOCATE(piz_inca(klon,klev,9,2))
-      ALLOCATE(cg_inca(klon,klev,9,2))
-      ALLOCATE(ccm(klon,klev,2))
+      ALLOCATE(tau_aero(klon,klev,naero_grp,nbands),piz_aero(klon,klev,naero_grp,nbands),cg_aero(klon,klev,naero_grp,nbands))
+      ALLOCATE(ccm(klon,klev,nbands))
 
 END SUBROUTINE phys_state_var_init
@@ -505 +485 @@
       deallocate(ibas_con, itop_con)
       deallocate(rain_con, snow_con)
-!
-      deallocate(sulfate_pi)
       deallocate(rlonPOS)
       deallocate(newsst)
@@ -512 +490 @@
       deallocate(topswad, solswad)
       deallocate(topswai, solswai)
-
-      deallocate(tau_ae, piz_ae)
-      deallocate(cg_ae)
-
-      IF (config_inca /= 'none') THEN
-         deallocate(topswad_inca, solswad_inca)
-         deallocate(topswad0_inca, solswad0_inca)
-         deallocate(topswai_inca, solswai_inca)
-         deallocate(topsw_inca, solsw_inca)
-         deallocate(topsw0_inca, solsw0_inca)
-      END IF
-      deallocate(tau_inca)
-      deallocate(piz_inca)
-      deallocate(cg_inca)
+      deallocate(tau_aero,piz_aero,cg_aero)
       deallocate(ccm)