Changeset 1771 for trunk/LMDZ.MARS/libf/phymars

Timestamp:

Aug 27, 2017, 8:22:48 AM (7 years ago)

Author:

aslmd

Message:

LMDZ.MARS dimradmars 1. add the possibility to deallocate common modules with subroutine (as in previous commit) 2. moved totcloudfrac allocation to dimradmars as suggested by AP it has nothing to do in physiq_mod

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• dimradmars_mod.F90 (modified) (3 diffs)
• physiq_mod.F (modified) (3 diffs)

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

@@ -98 +98 @@
   REAL,SAVE,ALLOCATABLE :: albedo(:,:) ! Surface albedo in each solar band
   REAL,SAVE,ALLOCATABLE :: tauscaling(:)   ! Convertion factor for qdust and Ndust
+  REAL,SAVE,ALLOCATABLE :: totcloudfrac(:) ! total cloud fraction over the column
 ! aerosol (dust or ice) extinction optical depth  at reference wavelength 
 ! "longrefvis" set in dimradmars_mod , for one of the "naerkind"  kind of
@@ -169 +170 @@
    allocate(tauscaling(ngrid))
    allocate(nueffdust(ngrid,nlayer))
+   allocate(totcloudfrac(ngrid))
 
   end subroutine ini_dimradmars_mod
+
+  subroutine end_dimradmars_mod
+
+  implicit none
+
+   if (allocated(albedo))      deallocate(albedo)
+   if (allocated(dtrad))       deallocate(dtrad)
+   if (allocated(fluxrad_sky)) deallocate(fluxrad_sky)
+   if (allocated(fluxrad))     deallocate(fluxrad)
+   if (allocated(tauscaling))  deallocate(tauscaling)
+   if (allocated(nueffdust))   deallocate(nueffdust)
+   if (allocated(totcloudfrac))   deallocate(totcloudfrac)
+
+  end subroutine end_dimradmars_mod
+
  
   subroutine ini_scatterers(ngrid,nlayer)
@@ -179 +196 @@
   integer,intent(in) :: nlayer ! number of atmospheric layers
 
-   allocate(name_iaer(naerkind))
+   !! domain-dependent 
+   !! -- only used in physiq_mod & intent(out) in callradite
+   if (allocated(aerosol)) deallocate(aerosol)
    allocate(aerosol(ngrid,nlayer,naerkind))
-   allocate(longrefir(naerkind))
-   allocate(longrefvis(naerkind))
-   allocate(iaerdust(naerkind))
-   allocate(file_id(naerkind,2))
-
-   allocate(QVISsQREF(nsun,naerkind,nsizemax))
-   allocate(omegavis(nsun,naerkind,nsizemax))
-   allocate(gvis(nsun,naerkind,nsizemax))
-   allocate(QIRsQREF(nir,naerkind,nsizemax))
-   allocate(omegaIR(nir,naerkind,nsizemax))
-   allocate(gIR(nir,naerkind,nsizemax))
-   allocate(nsize(naerkind,2))
-   allocate(radiustab(naerkind,2,nsizemax))
-   allocate(QREFvis(naerkind,nsizemax))
-   allocate(QREFir(naerkind,nsizemax))
-   allocate(omegaREFvis(naerkind,nsizemax))
-   allocate(omegaREFir(naerkind,nsizemax))
+
+   !! not domain-dependent
+   if (.not.allocated(name_iaer)) allocate(name_iaer(naerkind))
+   if (.not.allocated(longrefir)) allocate(longrefir(naerkind))
+   if (.not.allocated(longrefvis)) allocate(longrefvis(naerkind))
+   if (.not.allocated(iaerdust)) allocate(iaerdust(naerkind))
+   if (.not.allocated(file_id)) allocate(file_id(naerkind,2))
+   if (.not.allocated(QVISsQREF)) allocate(QVISsQREF(nsun,naerkind,nsizemax))
+   if (.not.allocated(omegavis)) allocate(omegavis(nsun,naerkind,nsizemax))
+   if (.not.allocated(gvis)) allocate(gvis(nsun,naerkind,nsizemax))
+   if (.not.allocated(QIRsQREF)) allocate(QIRsQREF(nir,naerkind,nsizemax))
+   if (.not.allocated(omegaIR)) allocate(omegaIR(nir,naerkind,nsizemax))
+   if (.not.allocated(gIR)) allocate(gIR(nir,naerkind,nsizemax))
+   if (.not.allocated(nsize)) allocate(nsize(naerkind,2))
+   if (.not.allocated(radiustab)) allocate(radiustab(naerkind,2,nsizemax))
+   if (.not.allocated(QREFvis)) allocate(QREFvis(naerkind,nsizemax))
+   if (.not.allocated(QREFir)) allocate(QREFir(naerkind,nsizemax))
+   if (.not.allocated(omegaREFvis)) allocate(omegaREFvis(naerkind,nsizemax))
+   if (.not.allocated(omegaREFir)) allocate(omegaREFir(naerkind,nsizemax))
 
   end subroutine ini_scatterers

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

@@ -38 +38 @@
       use conc_mod, only: rnew, cpnew, mmean
       use time_phylmdz_mod, only: iphysiq, day_step, ecritstart, daysec
-      use dimradmars_mod, only: tauscaling, aerosol,
+      use dimradmars_mod, only: tauscaling, aerosol, totcloudfrac,
      &                          dtrad, fluxrad_sky, fluxrad, albedo,
      &                          naerkind
@@ -403 +403 @@
       ! tf: fraction of clouds, ntf: fraction without clouds
       real tf, ntf
-      real,allocatable,dimension(:),save :: totcloudfrac ! total cloud fraction over the column
       REAL rave2(ngrid), totrave2(ngrid) ! Mean water ice mean radius (m)
 
@@ -414 +413 @@
 c  ---------------------------------------
       IF (firstcall) THEN
-        ALLOCATE(totcloudfrac(ngrid)) !A. Pottier: souci avec ca a priori, tentative
-                                      ! de les allouer dans dimradmars_mod.F90 
 
 c        variables set to 0