Changeset 2032 for trunk

Timestamp:

Oct 30, 2018, 12:22:31 PM (6 years ago)

Author:

emillour

Message:

Generic GCM:

• correct a bug introduced in revision 2026; now that L_NGAUSS is a parameter read in via sugas_corrk (called at first call by callcorrk), automatic arrays of size L_NGAUSS cannot be declared in callcorrk and must be allocated once the value of L_NGAUSS has been set.
• turned optci, optcv and callcorrk into modules in the process.

EM

Location:

trunk/LMDZ.GENERIC

Files:

• README (modified) (1 diff)
• libf/phystd/callcorrk.F90 (modified) (7 diffs)
• libf/phystd/optci.F90 (modified) (2 diffs)
• libf/phystd/optcv.F90 (modified) (2 diffs)
• libf/phystd/physiq_mod.F90 (modified) (1 diff)
• libf/phystd/sugas_corrk.F90 (modified) (2 diffs)

trunk/LMDZ.GENERIC/README

@@ -1397 +1397 @@
 == 02/10/2018 == JL
 - correct a bug introduced in commit 1987 in optcv.
+
+== 30/10/2018 == EM
+- correct a bug introduced in revision 2026; now that L_NGAUSS is a parameter
+  read in via sugas_corrk (called at first call by callcorrk), automatic arrays
+  of size L_NGAUSS cannot be declared in callcorrk and must be allocated
+  once the value of L_NGAUSS has been set.
+- turned optci, optcv and callcorrk into modules in the process.

trunk/LMDZ.GENERIC/libf/phystd/callcorrk.F90

@@ +1 @@
+MODULE callcorrk_mod
+
+IMPLICIT NONE
+
+CONTAINS
+
       subroutine callcorrk(ngrid,nlayer,pq,nq,qsurf,           &
           albedo,albedo_equivalent,emis,mu0,pplev,pplay,pt,    & 
@@ -10 +16 @@
 
       use mod_phys_lmdz_para, only : is_master
-      use radinc_h
-      use radcommon_h
-      use watercommon_h
+      use radinc_h, only: L_NSPECTV, L_NSPECTI, naerkind, banddir, corrkdir,&
+                          L_LEVELS, L_NGAUSS, L_NLEVRAD, L_NLAYRAD, L_REFVAR
+      use radcommon_h, only: wrefvar, Cmk, fzeroi, fzerov, gasi, gasv, &
+                             glat_ig, gweight, pfgasref, pgasmax, pgasmin, &
+                             pgasref, tgasmax, tgasmin, tgasref, scalep, &
+                             ubari, wnoi, stellarf, glat, dwnv, dwni, tauray
+      use watercommon_h, only: psat_water, epsi
       use datafile_mod, only: datadir
       use ioipsl_getin_p_mod, only: getin_p
-      use gases_h
+      use gases_h, only: ngasmx
       use radii_mod, only : su_aer_radii,co2_reffrad,h2o_reffrad,dust_reffrad,h2so4_reffrad,back2lay_reffrad
       use aerosol_mod, only : iaero_co2,iaero_h2o,iaero_dust,iaero_h2so4, iaero_back2lay, iaero_nh3, iaero_aurora
-      USE tracer_h
+      use tracer_h, only: igcm_h2o_vap, igcm_h2o_ice, igcm_co2_ice
       use comcstfi_mod, only: pi, mugaz, cpp
       use callkeys_mod, only: varactive,diurnal,tracer,water,varfixed,satval,        &
                               kastprof,strictboundcorrk,specOLR,CLFvarying
-
+      use optcv_mod, only: optcv
+      use optci_mod, only: optci
       implicit none
 
@@ -113 +124 @@
       ! Optical values for the optci/cv subroutines
       REAL*8 stel(L_NSPECTV),stel_fract(L_NSPECTV)
-      REAL*8 dtaui(L_NLAYRAD,L_NSPECTI,L_NGAUSS)
-      REAL*8 dtauv(L_NLAYRAD,L_NSPECTV,L_NGAUSS)
-      REAL*8 cosbv(L_NLAYRAD,L_NSPECTV,L_NGAUSS)
-      REAL*8 cosbi(L_NLAYRAD,L_NSPECTI,L_NGAUSS)
-      REAL*8 wbari(L_NLAYRAD,L_NSPECTI,L_NGAUSS)
-      REAL*8 wbarv(L_NLAYRAD,L_NSPECTV,L_NGAUSS)
-      REAL*8 tauv(L_NLEVRAD,L_NSPECTV,L_NGAUSS)
-      REAL*8 taucumv(L_LEVELS,L_NSPECTV,L_NGAUSS)
-      REAL*8 taucumi(L_LEVELS,L_NSPECTI,L_NGAUSS)
+      ! NB: Arrays below are "save" to avoid reallocating them at every call
+      ! not because their content needs be reused from call to the next
+      REAL*8,allocatable,save :: dtaui(:,:,:)
+      REAL*8,allocatable,save :: dtauv(:,:,:)
+      REAL*8,allocatable,save :: cosbv(:,:,:)
+      REAL*8,allocatable,save :: cosbi(:,:,:)
+      REAL*8,allocatable,save :: wbari(:,:,:)
+      REAL*8,allocatable,save :: wbarv(:,:,:)
+      REAL*8,allocatable,save :: tauv(:,:,:)
+      REAL*8,allocatable,save :: taucumv(:,:,:)
+      REAL*8,allocatable,save :: taucumi(:,:,:)
 
       REAL*8 tauaero(L_LEVELS,naerkind)
@@ -136 +149 @@
       INTEGER ig,l,k,nw,iaer
 
-      real szangle
-      logical global1d
-      save szangle,global1d
+      real,save :: szangle
+      logical,save :: global1d
 !$OMP THREADPRIVATE(szangle,global1d)
-      real*8 taugsurf(L_NSPECTV,L_NGAUSS-1)
-      real*8 taugsurfi(L_NSPECTI,L_NGAUSS-1)
-      real*8 qvar(L_LEVELS)                    ! Mixing ratio of variable component (mol/mol).
+
+      real*8,allocatable,save :: taugsurf(:,:)
+      real*8,allocatable,save :: taugsurfi(:,:)
+      real*8 qvar(L_LEVELS)   ! Mixing ratio of variable component (mol/mol).
 
       ! Local aerosol optical properties for each column on RADIATIVE grid.
@@ -232 +245 @@
          call suaer_corrk       ! Set up aerosol optical properties.
         
+
+         ! now that L_NGAUSS has been initialized (by sugas_corrk)
+         ! allocate related arrays
+         ALLOCATE(dtaui(L_NLAYRAD,L_NSPECTI,L_NGAUSS))
+         ALLOCATE(dtauv(L_NLAYRAD,L_NSPECTV,L_NGAUSS))
+         ALLOCATE(cosbv(L_NLAYRAD,L_NSPECTV,L_NGAUSS))
+         ALLOCATE(cosbi(L_NLAYRAD,L_NSPECTI,L_NGAUSS))
+         ALLOCATE(wbari(L_NLAYRAD,L_NSPECTI,L_NGAUSS))
+         ALLOCATE(wbarv(L_NLAYRAD,L_NSPECTV,L_NGAUSS))
+         ALLOCATE(tauv(L_NLEVRAD,L_NSPECTV,L_NGAUSS))
+         ALLOCATE(taucumv(L_LEVELS,L_NSPECTV,L_NGAUSS))
+         ALLOCATE(taucumi(L_LEVELS,L_NSPECTI,L_NGAUSS))
+         ALLOCATE(taugsurf(L_NSPECTV,L_NGAUSS-1))
+         ALLOCATE(taugsurfi(L_NSPECTI,L_NGAUSS-1))
 
          if((igcm_h2o_vap.eq.0) .and. varactive)then
@@ -795 +822 @@
                end do
             endif
-            
+
             call optcv(dtauv,tauv,taucumv,plevrad,                 &
                  qxvaer,qsvaer,gvaer,wbarv,cosbv,tauray,tauaero,   &
@@ -973 +1000 @@
 
     end subroutine callcorrk
+
+END MODULE callcorrk_mod

trunk/LMDZ.GENERIC/libf/phystd/optci.F90

@@ +1 @@
+MODULE optci_mod
+
+IMPLICIT NONE
+
+CONTAINS
+
 subroutine optci(PLEV,TLEV,DTAUI,TAUCUMI,      &
      QXIAER,QSIAER,GIAER,COSBI,WBARI,TAUAERO,  &
      TMID,PMID,TAUGSURF,QVAR,MUVAR)
 
-  use radinc_h
+  use radinc_h, only: L_LEVELS, L_NLAYRAD, L_NSPECTI, L_NGAUSS, &
+                      L_NLEVRAD, L_REFVAR, naerkind
   use radcommon_h, only: gasi,tlimit,wrefVAR,Cmk,tgasref,pfgasref,wnoi,scalep,indi,glat_ig
-  use gases_h
+  use gases_h, only: gfrac, ngasmx, igas_N2, igas_He, igas_H2O, igas_H2
   use comcstfi_mod, only: g, r, mugaz
   use callkeys_mod, only: kastprof,continuum,graybody,H2Ocont_simple
@@ -444 +451 @@
   
 
-  return
-
-
 end subroutine optci
 
-
-
+END MODULE optci_mod
+

trunk/LMDZ.GENERIC/libf/phystd/optcv.F90

@@ +1 @@
+MODULE optcv_mod
+
+IMPLICIT NONE
+
+CONTAINS
+
 SUBROUTINE OPTCV(DTAUV,TAUV,TAUCUMV,PLEV,  &
      QXVAER,QSVAER,GVAER,WBARV,COSBV,       &
      TAURAY,TAUAERO,TMID,PMID,TAUGSURF,QVAR,MUVAR)
 
-  use radinc_h
+  use radinc_h, only: L_NLAYRAD, L_NLEVRAD, L_LEVELS, L_NSPECTV, L_NGAUSS, L_REFVAR, NAERKIND
   use radcommon_h, only: gasv, tlimit, wrefVAR, Cmk, tgasref, pfgasref,wnov,scalep,indv,glat_ig
-  use gases_h
+  use gases_h, only: gfrac, ngasmx, igas_H2, igas_H2O, igas_He, igas_N2
   use comcstfi_mod, only: g, r, mugaz
   use callkeys_mod, only: kastprof,continuum,graybody,H2Ocont_simple,callgasvis
@@ -369 +375 @@
 
 
-  return
-
-
 end subroutine optcv
+
+END MODULE optcv_mod

trunk/LMDZ.GENERIC/libf/phystd/physiq_mod.F90

@@ -49 +49 @@
       use conc_mod
       use phys_state_var_mod
+      use callcorrk_mod, only: callcorrk
       use turb_mod, only : q2,sensibFlux,turb_resolved
 #ifndef MESOSCALE

trunk/LMDZ.GENERIC/libf/phystd/sugas_corrk.F90

@@ -20 +20 @@
 !==================================================================
 
-      use radinc_h
+      use radinc_h, only: corrkdir, banddir, L_NSPECTI, L_NSPECTV, &
+                          L_NGAUSS, L_NPREF, L_NTREF, L_REFVAR, L_PINT
       use radcommon_h, only : pgasref,pfgasref,pgasmin,pgasmax
       use radcommon_h, only : tgasref,tgasmin,tgasmax
@@ -27 +28 @@
       use datafile_mod, only: datadir
       use comcstfi_mod, only: mugaz
-      use gases_h
+      use gases_h, only: gnom, ngasmx, &
+                         igas_H2, igas_H2O, igas_He, igas_N2
       use ioipsl_getin_p_mod, only: getin_p
       use callkeys_mod, only: varactive,varfixed,graybody,callgasvis,&