Changeset 484

Timestamp:

Dec 20, 2011, 12:00:51 PM (13 years ago)

Author:

aslmd

Message:

GENERIC: Allocatable gastype in sugas_corrk instead of hardcoded (it was a problem for more than 4 gases) JL + AS.

Location:

trunk/LMDZ.GENERIC

Files:

• README (modified) (1 diff)
• libf/phystd/radcommon_h.F90 (modified) (1 diff)
• libf/phystd/setspv.F90 (modified) (1 diff)
• libf/phystd/sugas_corrk.F90 (modified) (4 diffs)

trunk/LMDZ.GENERIC/README

@@ -571 +571 @@
 - 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.
+
+== 20/12/2011 == JL + AS
+- Allocatable gastype in sugas_corrk instead of hardcoded (it was a problem for more than 4 gases!)

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

@@ -62 +62 @@
 ! gIR      :  mean assymetry factor
 
-
-      character(len=3) :: gastype(3)
 
       REAL*8 BWNI(L_NSPECTI+1), WNOI(L_NSPECTI), DWNI(L_NSPECTI), WAVEI(L_NSPECTI)

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

@@ -25 +25 @@
       use radinc_h,    only: L_NSPECTV, corrkdir, banddir
       use radcommon_h, only: BWNV,BLAMV,WNOV,DWNV,WAVEV, &
-                             STELLARF,TAURAY,gastype
+                             STELLARF,TAURAY
       use datafile_mod, only: datadir
 

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

@@ -22 +22 @@
       use radcommon_h, only : tgasref,tgasmin,tgasmax
       use radcommon_h, only : gasv,gasi,FZEROI,FZEROV,gweight
-      use radcommon_h, only : wrefvar,gastype
+      use radcommon_h, only : wrefvar
       use datafile_mod, only: datadir
       use gases_h
@@ -41 +41 @@
       !! ALLOCATABLE ARRAYS -- AS 12/2011
       REAL*8, DIMENSION(:,:,:,:,:), ALLOCATABLE :: gasi8, gasv8
+      character*3,allocatable,DIMENSION(:) :: gastype ! for check with gnom
 
       real*8 x, xi(4), yi(4), ans, p
@@ -97 +98 @@
       endif
 
-
+      IF ( .NOT. ALLOCATED( gastype ) ) ALLOCATE( gastype( ngas ) )
       do n=1,ngas
          read(111,*) gastype(n)
@@ -536 +537 @@
       IF( ALLOCATED( gasv8 ) ) DEALLOCATE( gasv8 )
       IF( ALLOCATED( pgasref ) ) DEALLOCATE( pgasref )
-
+      IF( ALLOCATED( gastype ) ) DEALLOCATE( gastype )
 
       return