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

Timestamp:

Sep 23, 2013, 9:56:47 AM (11 years ago)

Author:

emillour

Message:

Mars GCM:

• IMPORTANT CHANGE: Removed all reference/use of ngridmx (dimphys.h) in routines (necessary prerequisite to using parallel dynamics); in most cases this just means adding 'ngrid' as routine argument, and making local saved variables allocatable (and allocated at first call). In the process, had to convert many *.h files to equivalent modules: yomaer.h => yomaer_h.F90 , surfdat.h => surfdat_h.F90 , comsaison.h => comsaison_h.F90 , yomlw.h => yomlw_h.F90 , comdiurn.h => comdiurn_h.F90 , dimradmars.h => dimradmars_mod.F90 , comgeomfi.h => comgeomfi_h.F90, comsoil.h => comsoil_h.F90 , slope.h => slope_mod.F90
• Also updated EOF routines, everything is now in eofdump_mod.F90
• Removed unused routine lectfux.F (in dyn3d)

EM

File:

• trunk/LMDZ.MARS/libf/phymars/suaer.F90 (modified) (6 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, &
+                    nsize
 IMPLICIT NONE
 !==================================================================
@@ -34 +40 @@
 #include "callkeys.h"
 #include "datafile.h"
-#include "dimensions.h"
-#include "dimphys.h"
-#include "dimradmars.h"     
-#include "yomaer.h"
+!#include "dimensions.h"
+!#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"
 
@@ -350 +358 @@
    write(*,*) "       nsizemax=",nsizemax
    write(*,*) "       you must increase the value of nsizemax"
-   write(*,*) "       in dimradmars.h !"
+   write(*,*) "       in dimradmars_mod !"
    stop
  endif
@@ -362 +370 @@
 !   and not epref, which is a different parameter);
 !   Reference wavelengths are defined for each aerosol in
-!   dimradmars.h.
+!   dimradmars_mod.
 
   CALL aerave ( nwvl,&
@@ -420 +428 @@
 !   and not epref, which is a different parameter);
 !   Reference wavelengths are defined for each aerosol in
-!   dimradmars.h.
+!   dimradmar_mod.
 
   CALL aerave ( nwvl,&
@@ -448 +456 @@
 !         Single scattering properties
 !           in each of the "nir" bands
-!           (cf. dimradmars.h)
+!           (cf. dimradmars_mod)
 
 ! iir=1 : central 15um CO2 bands