Changeset 1770 for trunk

Timestamp:

Aug 27, 2017, 8:00:21 AM (7 years ago)

Author:

aslmd

Message:

LMDZ.MARS setting the stage for maybe fixing nesting in the LMD_MM_MARS 1. add the possibility to deallocate common modules with subroutines

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• comgeomfi_h.F90 (modified) (1 diff)
• comsaison_h.F90 (modified) (1 diff)
• comsoil_h.F90 (modified) (2 diffs)
• conc_mod.F90 (modified) (1 diff)
• slope_mod.F90 (modified) (1 diff)
• surfdat_h.F90 (modified) (1 diff)
• tracer_mod.F90 (modified) (2 diffs)
• turb_mod.F90 (modified) (1 diff)

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

@@ -31 +31 @@
          end subroutine ini_comgeomfi_h
 
+
+         subroutine end_comgeomfi_h
+
+         implicit none
+
+         if (allocated(sinlat)) deallocate(sinlat)
+         if (allocated(coslat)) deallocate(coslat)
+         if (allocated(sinlon)) deallocate(sinlon)
+         if (allocated(coslon)) deallocate(coslon)
+
+         end subroutine end_comgeomfi_h
+
          subroutine ini_fillgeom(ngrid,plat,plon,parea)
 

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

@@ -21 +21 @@
   
   end subroutine ini_comsaison_h
+
+
+  subroutine end_comsaison_h
+
+  implicit none
+
+    if (allocated(mu0)) deallocate(mu0)
+    if (allocated(fract)) deallocate(fract)
+
+  end subroutine end_comsaison_h
   
 end module comsaison_h

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

@@ -14 +14 @@
        !                 soil_settings.F)
 
-  ! variables
-  REAL,SAVE,ALLOCATABLE :: tsoil(:,:)  ! sub-surface temperatures (K)
-  real,save,allocatable :: mthermdiff(:,:)  ! mid-layer thermal diffusivity
-  real,save,allocatable :: thermdiff(:,:)   ! inter-layer thermal diffusivity
-  real,save,allocatable :: coefq(:)         ! q_{k+1/2} coefficients
-  real,save,allocatable :: coefd(:,:)       ! d_k coefficients
-  real,save,allocatable :: alph(:,:)        ! alpha_k coefficients
+  ! variables (FC: built in firstcall in soil.F)
+  REAL,SAVE,ALLOCATABLE :: tsoil(:,:)       ! sub-surface temperatures (K)
+  real,save,allocatable :: mthermdiff(:,:)  ! (FC) mid-layer thermal diffusivity
+  real,save,allocatable :: thermdiff(:,:)   ! (FC) inter-layer thermal diffusivity
+  real,save,allocatable :: coefq(:)         ! (FC) q_{k+1/2} coefficients
+  real,save,allocatable :: coefd(:,:)       ! (FC) d_k coefficients
+  real,save,allocatable :: alph(:,:)        ! (FC) alpha_k coefficients
   real,save,allocatable :: beta(:,:)        ! beta_k coefficients
   real,save :: mu
@@ -47 +47 @@
   end subroutine ini_comsoil_h
 
+
+  subroutine end_comsoil_h
+
+  implicit none
+
+    if (allocated(layer)) deallocate(layer)
+    if (allocated(mlayer)) deallocate(mlayer)
+    if (allocated(inertiedat)) deallocate(inertiedat)
+    if (allocated(tsoil)) deallocate(tsoil)
+    if (allocated(mthermdiff)) deallocate(mthermdiff)
+    if (allocated(thermdiff)) deallocate(thermdiff)
+    if (allocated(coefq)) deallocate(coefq) 
+    if (allocated(coefd)) deallocate(coefd)
+    if (allocated(alph)) deallocate(alph)
+    if (allocated(beta)) deallocate(beta)
+
+  end subroutine end_comsoil_h
+
 end module comsoil_h

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

@@ -23 +23 @@
   end subroutine ini_conc_mod
 
+
+  subroutine end_conc_mod
+
+  implicit none
+
+    if (allocated(mmean)) deallocate(mmean)
+    if (allocated(Akknew)) deallocate(Akknew)
+    if (allocated(cpnew)) deallocate(cpnew)
+    if (allocated(rnew)) deallocate(rnew)
+
+  end subroutine end_conc_mod
+
 end module conc_mod

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

@@ -17 +17 @@
   
   end subroutine ini_slope_mod
+
+
+  subroutine end_slope_mod
+
+  implicit none
+
+  if (allocated(theta_sl)) deallocate(theta_sl)
+  if (allocated(psi_sl)) deallocate(psi_sl)
+
+  end subroutine end_slope_mod
   
 end module slope_mod

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

@@ -58 +58 @@
   end subroutine ini_surfdat_h
 
+
+  subroutine end_surfdat_h
+
+  implicit none
+
+    if (allocated(albedodat))   deallocate(albedodat)
+    if (allocated(phisfi))      deallocate(phisfi)
+    if (allocated(watercaptag)) deallocate(watercaptag)
+    if (allocated(dryness))     deallocate(dryness)
+    if (allocated(zmea))        deallocate(zmea)
+    if (allocated(zstd))        deallocate(zstd)
+    if (allocated(zsig))        deallocate(zsig)
+    if (allocated(zgam))        deallocate(zgam)
+    if (allocated(zthe))        deallocate(zthe)
+    if (allocated(z0))          deallocate(z0)
+    if (allocated(qsurf))       deallocate(qsurf)
+    if (allocated(tsurf))       deallocate(tsurf)
+    if (allocated(co2ice))      deallocate(co2ice)
+    if (allocated(emis))        deallocate(emis)
+    if (allocated(capcal))      deallocate(capcal)
+    if (allocated(fluxgrd))     deallocate(fluxgrd)
+
+  end subroutine end_surfdat_h
+
 end module surfdat_h

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

@@ -128 +128 @@
             
       ! allocate module arrays:
+      ! -- not domain-dependent
       allocate(mmol(nq))
       allocate(radius(nq))
@@ -138 +139 @@
     end subroutine ini_tracer_mod
 
+    subroutine end_tracer_mod
+
+    implicit none
+
+      if (allocated(noms)) deallocate(noms)
+      if (allocated(mmol)) deallocate(mmol)
+      if (allocated(radius)) deallocate(radius)
+      if (allocated(rho_q)) deallocate(rho_q)
+      if (allocated(alpha_lift)) deallocate(alpha_lift)
+      if (allocated(alpha_devil)) deallocate(alpha_devil)
+      if (allocated(igcm_dustbin)) deallocate(igcm_dustbin)
+      if (allocated(nqdust)) deallocate(nqdust)
+
+    end subroutine end_tracer_mod
+
 end module tracer_mod

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

@@ -33 +33 @@
   end subroutine ini_turb_mod
 
+  subroutine end_turb_mod
+
+  implicit none
+
+    if (allocated(q2)) deallocate(q2)
+    if (allocated(l0)) deallocate(l0)
+    if (allocated(wstar)) deallocate(wstar)
+    if (allocated(ustar)) deallocate(ustar)
+    if (allocated(tstar)) deallocate(tstar)
+    if (allocated(hfmax_th)) deallocate(hfmax_th)
+    if (allocated(zmax_th)) deallocate(zmax_th)
+    if (allocated(sensibFlux)) deallocate(sensibFlux)
+
+  end subroutine end_turb_mod
+
 end module turb_mod