Changeset 471 for trunk/LMDZ.GENERIC

Timestamp:

Dec 13, 2011, 11:57:59 PM (13 years ago)

Author:

aslmd

Message:

LMDZ.GENERIC

13/12/2011 == AS

• Same spirit as previous commit, but for ngasmx which is now read in gases.def -- before arrays w/ dim ngasmx are allocated dynamically
• Allocation is done in su_gases.F90 which is called in inifis
• Outside su_gases.F90, very few modifications to the code : the new module "gases_h.F90" simply replaces the old common "gases.h" !
• Compiles fine. Tested with debugging options through pgdbg. Runs fine. Exact same results in Early Mars test case.

Location:

trunk/LMDZ.GENERIC

Files:

• README (modified) (1 diff)
• libf/phystd/calc_cpp_mugaz.F90 (modified) (1 diff)
• libf/phystd/calc_rayleigh.F90 (modified) (2 diffs)
• libf/phystd/callcorrk.F90 (modified) (2 diffs)
• libf/phystd/condens_co2cloud.F90 (modified) (2 diffs)
• libf/phystd/condense_cloud.F90 (modified) (2 diffs)
• libf/phystd/cp_neutral.F90 (modified) (1 diff)
• libf/phystd/gases.h (deleted)
• libf/phystd/gases_h.F90 (added)
• libf/phystd/gradients_kcm.F90 (modified) (1 diff)
• libf/phystd/kcmprof_fn.F90 (modified) (2 diffs)
• libf/phystd/optci.F90 (modified) (2 diffs)
• libf/phystd/optcv.F90 (modified) (2 diffs)
• libf/phystd/physiq.F90 (modified) (2 diffs)
• libf/phystd/su_gases.F90 (modified) (5 diffs)
• libf/phystd/sugas_corrk.F90 (modified) (1 diff)

trunk/LMDZ.GENERIC/README

@@ -565 +565 @@
 M              469   libf/phystd/radinc_h.F90
 M              469   libf/phystd/radcommon_h.F90
+
+== 13/12/2011 == AS
+- Same spirit as previous commit, but for ngasmx which is now read in gases.def -- before arrays w/ dim ngasmx are allocated dynamically
+- Allocation is done in su_gases.F90 which is called in inifis
+- Outside su_gases.F90, very few modifications to the code : the new module "gases_h.F90" simply replaces the old common "gases.h" !
+- Compiles fine. Tested with debugging options through pgdbg. Runs fine. Exact same results in Early Mars test case.

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

@@ -13 +13 @@
 !==================================================================
 
+      use gases_h
       implicit none
 
 #include "comcstfi.h"
 !#include "callkeys.h"
-#include "gases.h"
 
       integer igas

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

@@ -26 +26 @@
       use radinc_h, only: L_NSPECTV
       use radcommon_h, only: WAVEV, BWNV, DWNV, tstellar, tauray, scalep
+      use gases_h
 
       implicit none
@@ -31 +32 @@
 #include "comcstfi.h"
 #include "callkeys.h"
-#include "gases.h"
 
       real*8 wl

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

@@ -13 +13 @@
       use datafile_mod, only: datadir
       use ioipsl_getincom 
+      use gases_h
 
       implicit none
@@ -35 +36 @@
 #include "callkeys.h"
 #include "tracer.h"
-#include "gases.h"
 
 !-----------------------------------------------------------------------

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

@@ -7 +7 @@
 
       use radinc_h, only : naerkind
+      use gases_h
 
       implicit none
@@ -56 +57 @@
 #include "callkeys.h"
 #include "tracer.h"
-#include "gases.h"
 
 !-----------------------------------------------------------------------

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

@@ -7 +7 @@
 
       use radinc_h, only : naerkind
+      use gases_h
 
       implicit none
@@ -56 +57 @@
 #include "callkeys.h"
 #include "tracer.h"
-#include "gases.h"
 
 !-----------------------------------------------------------------------

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

@@ -1 +1 @@
 double precision function cp_neutral(T)
 
+  use gases_h
+
   implicit none
-
-#include "gases.h"
 
   ! inputs

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

@@ -2 +2 @@
 
   use params_h
+  use gases_h
   implicit none
-
-#include "gases.h"
 
   ! inputs

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

@@ -3 +3 @@
 use params_h
 use watercommon_h, only : mH2O
+use gases_h
 implicit none
 
@@ -15 +16 @@
 #include "comcstfi.h"
 #include "callkeys.h"
-#include "gases.h"
 
   integer ilay, nlay

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

@@ -5 +5 @@
       use radinc_h
       use radcommon_h, only: gasi, tlimit, wrefVAR, Cmk,tgasref,pfgasref,wnoi,scalep
+      use gases_h
       implicit none
 
@@ -30 +31 @@
 #include "comcstfi.h"
 #include "callkeys.h"
-#include "gases.h"
 
 

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

@@ -5 +5 @@
       use radinc_h
       use radcommon_h, only: gasv, tlimit, wrefVAR, Cmk, tgasref, pfgasref,wnov,scalep
+      use gases_h
 
       implicit none
@@ -36 +37 @@
 #include "callkeys.h"
 #include "comcstfi.h"
-#include "gases.h"
 
       real*8 DTAUV(L_NLAYRAD,L_NSPECTV,L_NGAUSS)

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

@@ -9 +9 @@
       use radinc_h, only : naerkind
       use watercommon_h, only : mx_eau_sol, To, RLVTT, mH2O
-     
+      use gases_h
       implicit none
 
@@ -2147 +2147 @@
       icount=icount+1
 
+      !!! DEALLOCATE STUFF
+      if (lastcall) then
+        IF ( ALLOCATED( gnom ) ) DEALLOCATE( gnom )    !! this was allocated in su_gases.F90
+        IF ( ALLOCATED( gfrac ) ) DEALLOCATE( gfrac )  !! this was allocated in su_gases.F90
+      endif
+
+
       return
     end subroutine physiq

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

@@ -1 +1 @@
 subroutine su_gases
+
+  use gases_h
 
   implicit none
 
-#include "gases.h"
-
-       integer ngas, igas, ierr
+       integer igas, ierr
 
 !==================================================================
@@ -24 +24 @@
           write(*,*) "sugases.F90: reading file gases.def"
           read(90,*)
-          read(90,*,iostat=ierr) ngas
+          read(90,*,iostat=ierr) ngasmx
           if (ierr.ne.0) then
              write(*,*) "sugases.F90: error reading number of gases"
@@ -30 +30 @@
              call abort
           endif
-          ! check that the number of gases is indeed ngasmx
-          if (ngas.ne.ngasmx) then
-             write(*,*) "sugases.F90: error, wrong number of gases:"
-             write(*,*) "ngas=",ngas," whereas ngasmx=",ngasmx
-             write(*,*) "Check that the values in gases.def and gases.h match..."
-             call abort
-          endif
 
-          do igas=1,ngas
+          PRINT *, "OK I HAVE ",ngasmx, " GASES. NOW I ALLOCATE ARRAYS AND READ NAMES AND FRAC."
+
+          IF ( .NOT. ALLOCATED( gnom ) ) ALLOCATE( gnom( ngasmx ) )
+          do igas=1,ngasmx
              read(90,*,iostat=ierr) gnom(igas)
              if (ierr.ne.0) then
@@ -44 +40 @@
                 call abort
              endif
-          enddo                  !of do igas=1,ngas
+          enddo                  !of do igas=1,ngasmx
           
           vgas=0
-          do igas=1,ngas
+          IF ( .NOT. ALLOCATED( gfrac ) ) ALLOCATE( gfrac( ngasmx ) )
+          do igas=1,ngasmx
              read(90,*,iostat=ierr) gfrac(igas)
              if (ierr.ne.0) then
@@ -65 +62 @@
              endif
              
-          enddo                  !of do igas=1,ngas
+          enddo                  !of do igas=1,ngasmx
 
        else

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

@@ -24 +24 @@
       use radcommon_h, only : wrefvar,gastype
       use datafile_mod, only: datadir
+      use gases_h
       implicit none
 
 #include "callkeys.h"
-#include "gases.h"
 
 !==================================================================