Changeset 1246 for trunk/LMDZ.MARS/libf/phymars/aeroptproperties.F

Timestamp:

May 11, 2014, 2:37:58 PM (11 years ago)

Author:

aslmd

Message:

LMDZ.MARS. Made number of scatterers a free dimension not in need to be prescribe at compiling time. Instead it must be set in callphys.def. See README for further information about this commit.

File:

• trunk/LMDZ.MARS/libf/phymars/aeroptproperties.F (modified) (6 diffs)

trunk/LMDZ.MARS/libf/phymars/aeroptproperties.F

@@ -4 +4 @@
      &                            QREFvis3d,QREFir3d,
      &                            omegaREFvis3d,omegaREFir3d)
-      use dimradmars_mod, only: nir, nsun
-      use yomaer_h, only: radiustab, nsize, QVISsQREF, omegavis, gvis,
-     &                    QIRsQREF, omegaIR, gIR, QREFvis, QREFir,
-     &                    omegaREFvis, omegaREFir
+      use dimradmars_mod, only: nir, nsun, naerkind,
+     &                radiustab, nsize, QVISsQREF, omegavis, gvis,
+     &                QIRsQREF, omegaIR, gIR, QREFvis, QREFir,
+     &                omegaREFvis, omegaREFir
       IMPLICIT NONE
 c     =============================================================
@@ -31 +31 @@
 #include "callkeys.h"
 !#include "dimradmars.h"
-!#include "yomaer.h"
-! naerkind is set in scatterers.h (built when compiling with makegcm -s #)
-#include"scatterers.h"
 
 c     Local variables 
@@ -39 +36 @@
 
 c     =============================================================
-      LOGICAL, PARAMETER :: varyingnueff(naerkind) = .false.
+      LOGICAL,SAVE,ALLOCATABLE :: varyingnueff(:)
 c     =============================================================
 
 c     Min. and max radius of the interpolation grid (in METERS)
-      REAL, SAVE :: refftabmin(naerkind,2)
-      REAL, SAVE :: refftabmax(naerkind,2)
+      REAL, SAVE, ALLOCATABLE :: refftabmin(:,:)
+      REAL, SAVE, ALLOCATABLE :: refftabmax(:,:)
+
 c     Log of the min and max variance of the interpolation grid
       REAL, PARAMETER :: nuefftabmin = -4.6
@@ -97 +95 @@
       REAL,SAVE,ALLOCATABLE :: nuefftab(:,:,:)
 c     Volume ratio of the grid
-      REAL,SAVE :: logvratgrid(naerkind,2)
+      REAL,SAVE,ALLOCATABLE :: logvratgrid(:,:)
 c     Grid used to remember which calculation is done
-      LOGICAL,SAVE :: checkgrid(refftabsize,nuefftabsize,naerkind,2)
-     &                = .false.
+      LOGICAL,SAVE,ALLOCATABLE :: checkgrid(:,:,:,:)
 c     Optical properties of the grid (VISIBLE)
       REAL,SAVE,ALLOCATABLE :: qsqrefVISgrid(:,:,:,:)
@@ -114 +111 @@
       REAL,SAVE,ALLOCATABLE :: gIRgrid(:,:,:,:)
 c     Optical properties of the grid (REFERENCE WAVELENGTHS)
-      REAL,SAVE :: qrefVISgrid(refftabsize,nuefftabsize,naerkind)
-      REAL,SAVE :: qscatrefVISgrid(refftabsize,nuefftabsize,naerkind)
-      REAL,SAVE :: qrefIRgrid(refftabsize,nuefftabsize,naerkind)
-      REAL,SAVE :: qscatrefIRgrid(refftabsize,nuefftabsize,naerkind)
-      REAL,SAVE :: omegrefVISgrid(refftabsize,nuefftabsize,naerkind)
-      REAL,SAVE :: omegrefIRgrid(refftabsize,nuefftabsize,naerkind)
+      REAL,SAVE,ALLOCATABLE :: qrefVISgrid(:,:,:)
+      REAL,SAVE,ALLOCATABLE :: qscatrefVISgrid(:,:,:)
+      REAL,SAVE,ALLOCATABLE :: qrefIRgrid(:,:,:)
+      REAL,SAVE,ALLOCATABLE :: qscatrefIRgrid(:,:,:)
+      REAL,SAVE,ALLOCATABLE :: omegrefVISgrid(:,:,:)
+      REAL,SAVE,ALLOCATABLE :: omegrefIRgrid(:,:,:)
 c     Firstcall
       LOGICAL,SAVE :: firstcall = .true.
 c     Variables used by the Gauss-Legendre integration:
-      REAL,SAVE :: normd(refftabsize,nuefftabsize,naerkind,2)
-      REAL,SAVE :: dista(refftabsize,nuefftabsize,naerkind,2,ngau)
-      REAL,SAVE :: distb(refftabsize,nuefftabsize,naerkind,2,ngau)
-
-      REAL,SAVE :: radGAUSa(ngau,naerkind,2)
-      REAL,SAVE :: radGAUSb(ngau,naerkind,2)
+      REAL,SAVE,ALLOCATABLE :: normd(:,:,:,:)
+      REAL,SAVE,ALLOCATABLE :: dista(:,:,:,:,:)
+      REAL,SAVE,ALLOCATABLE :: distb(:,:,:,:,:)
+      REAL,SAVE,ALLOCATABLE :: radGAUSa(:,:,:)
+      REAL,SAVE,ALLOCATABLE :: radGAUSb(:,:,:)
 
       REAL,SAVE,ALLOCATABLE :: qsqrefVISa(:,:,:)
@@ -233 +229 @@
         allocate(gIRa(nir,ngau,naerkind))
         allocate(gIRb(nir,ngau,naerkind))
-        
+       
+        allocate(qrefVISgrid(refftabsize,nuefftabsize,naerkind))
+        allocate(qscatrefVISgrid(refftabsize,nuefftabsize,naerkind))
+        allocate(qrefIRgrid(refftabsize,nuefftabsize,naerkind))
+        allocate(qscatrefIRgrid(refftabsize,nuefftabsize,naerkind))
+        allocate(omegrefVISgrid(refftabsize,nuefftabsize,naerkind))
+        allocate(omegrefIRgrid(refftabsize,nuefftabsize,naerkind))
+
+        allocate(normd(refftabsize,nuefftabsize,naerkind,2))
+        allocate(dista(refftabsize,nuefftabsize,naerkind,2,ngau))
+        allocate(distb(refftabsize,nuefftabsize,naerkind,2,ngau))
+        allocate(radGAUSa(ngau,naerkind,2))
+        allocate(radGAUSb(ngau,naerkind,2))
+
+        allocate(checkgrid(refftabsize,nuefftabsize,naerkind,2))
+        checkgrid(1:refftabsize,1:nuefftabsize,1:naerkind,1:2) = .false.
+
+        allocate(logvratgrid(naerkind,2))
+
+        allocate(refftabmin(naerkind,2))
+        allocate(refftabmax(naerkind,2))
+
+        allocate(varyingnueff(naerkind))
+        varyingnueff(1:naerkind) = .false.
+
 c       0.1 Pi!
         pi = 2. * asin(1.e0)