Changeset 1246 for trunk/LMDZ.MARS/libf/phymars/suaer.F90

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/suaer.F90 (modified) (3 diffs)

trunk/LMDZ.MARS/libf/phymars/suaer.F90

@@ -1 +1 @@
 SUBROUTINE suaer
 use dimradmars_mod, only: longrefvis, longrefir, nsizemax, long1vis, &
-                         long2vis, long3vis, long1ir, long2ir, long1co2, &
-                         long2co2, nsun, nir
-use yomaer_h, only: radiustab, gvis, omegavis, QVISsQREF, gIR, omegaIR, &
-                    QIRsQREF, QREFvis, QREFir, omegaREFvis, omegaREFir, &
+                    long2vis, long3vis, long1ir, long2ir, long1co2, &
+                    long2co2, nsun, nir,&
+                    naerkind, name_iaer, &
+                    iaer_dust_conrath,iaer_dust_doubleq,&
+                    iaer_dust_submicron,iaer_h2o_ice,&
+                    file_id,radiustab, gvis, omegavis, &
+                    QVISsQREF, gIR, omegaIR, &
+                    QIRsQREF, QREFvis, QREFir, &
+                    omegaREFvis, omegaREFir, &
                     nsize
 IMPLICIT NONE
@@ -43 +48 @@
 !#include "dimphys.h"
 !#include "dimradmars.h"     
-!#include "yomaer.h"
-! naerkind is set in scatterers.h (built when compiling with makegcm -s #)
-#include"scatterers.h"
-#include "aerkind.h"
 
 ! Optical properties (read in external ASCII files)
@@ -92 +93 @@
 REAL omegav(nir)     ! Average sing.scat.albedo
 REAL gav(nir)        ! Average assymetry parameter
-
-! Local saved variables:
-
-CHARACTER(LEN=30), DIMENSION(naerkind,2), SAVE :: file_id
 
 !==================================================================