Changeset 1047 for trunk/LMDZ.MARS/libf/phymars/swr_toon.F

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/swr_toon.F (modified) (2 diffs)

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

@@ -4 +4 @@
      S     ,  PFD,PFU )
 
+      use dimradmars_mod, only: sunfr, ndlo2, nsun, nflev, ndlon
+      use yomlw_h, only: nlaylte
+      
       IMPLICIT NONE
 C     
-#include "dimensions.h"
-#include "dimphys.h"
-#include "dimradmars.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
+!#include "dimradmars.h"
 #include "callkeys.h"
-
-#include "yomaer.h"
-#include "yomlw.h"
+! naerkind is set in scatterers.h (built when compiling with makegcm -s #)
+#include"scatterers.h"
+!#include "yomaer.h"
+!#include "yomlw.h"
 
 C     
@@ -36 +40 @@
 c   aerosol               aerosol extinction optical depth
 c                         at reference wavelength "longrefvis" set
-c                         in dimradmars.h , in each layer, for one of
+c                         in dimradmars_mod , in each layer, for one of
 c                         the "naerkind" kind of aerosol optical properties.
 c    albedo   hemispheric surface albedo