Changeset 747 for trunk/LMDZ.GENERIC/libf

Timestamp:

Jul 27, 2012, 1:32:45 AM (12 years ago)

Author:

aslmd

Message:

GENERIC: improved iniaerosol and aerosol_mod. solved bugs for ifort+parallel while keeping things OK in seq runs.

Location:

trunk/LMDZ.GENERIC/libf/phystd

Files:

• aerosol_mod.F90 (modified) (1 diff)
• iniaerosol.F (modified) (1 diff)

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

@@ -1 +1 @@
 !==================================================================
 module aerosol_mod
+implicit none
+save
 !==================================================================
 
-!  aerosol indexes: these are initialized in iniaerosol.F and should be 0 if the
+!  aerosol indexes: these are initialized to be 0 if the
 !                 corresponding aerosol was not activated in callphys.def
-      integer, save :: iaero_co2 
-      integer, save :: iaero_h2o
-      integer, save :: iaero_dust
-      integer, save :: iaero_h2so4
-      logical, save :: noaero
+!                 -- otherwise a value is given in iniaerosol
+      integer :: iaero_co2 = 0 
+      integer :: iaero_h2o = 0
+      integer :: iaero_dust = 0
+      integer :: iaero_h2so4 = 0
+      logical :: noaero = .false.
       
 !==================================================================

trunk/LMDZ.GENERIC/libf/phystd/iniaerosol.F

@@ -21 +21 @@
       integer ia
 
-      ! Initialize aerosol indexes to zero:
-      ! NB: iaero_* indexes are in module aerosol_mod
-
-      iaero_co2   =0
-      iaero_h2o   =0
-      iaero_dust  =0
-      iaero_h2so4 =0
-      noaero = .false.
- 
       ia=0
       if (aeroco2) then
          ia=ia+1
          iaero_co2=ia
-         write(*,*) 'CO2 aerosol = ', iaero_co2
       endif
+      write(*,*) '--- CO2 aerosol = ', iaero_co2
  
       if (aeroh2o) then
          ia=ia+1
          iaero_h2o=ia
-         write(*,*) 'H2O aerosol = ', iaero_h2o
       endif
+      write(*,*) '--- H2O aerosol = ', iaero_h2o
 
       if (dusttau.gt.0) then
          ia=ia+1
          iaero_dust=ia
-         write(*,*) 'Dust aerosol = ', iaero_dust
       endif
+      write(*,*) '--- Dust aerosol = ', iaero_dust
 
       if (aeroh2so4) then
          ia=ia+1
          iaero_h2so4=ia
-         write(*,*) 'H2SO4 aerosol = ', iaero_h2so4
       endif
+      write(*,*) '--- H2SO4 aerosol = ', iaero_h2so4
       
-      write(*,*) 'Number of aerosols= ', ia
+      write(*,*) '=== Number of aerosols= ', ia
       
 ! For the zero aerosol case, we currently make a dummy co2 aerosol which is zero everywhere.