Changeset 2026 for trunk/LMDZ.GENERIC

Timestamp:

Oct 25, 2018, 5:25:58 PM (6 years ago)

Author:

jvatant

Message:

Radiative transfer init minor change
-> Make L_NGAUSS be read by master in g.dat by sugas_corrk as for L_NPREF,L_NTREF ...
-- JVO.

Location:

trunk/LMDZ.GENERIC/libf/phystd

Files:

• callcorrk.F90 (modified) (1 diff)
• radcommon_h.F90 (modified) (2 diffs)
• radinc_h.F90 (modified) (1 diff)
• sugas_corrk.F90 (modified) (2 diffs)

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

@@ -964 +964 @@
         IF( ALLOCATED( wrefvar ) ) DEALLOCATE( wrefvar )
         IF( ALLOCATED( pfgasref ) ) DEALLOCATE( pfgasref )
+        IF( ALLOCATED( gweight ) ) DEALLOCATE( gweight )
 !$OMP END MASTER
 !$OMP BARRIER

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

@@ -79 +79 @@
       !!! ALLOCATABLE STUFF SO THAT DIMENSIONS ARE READ in *.dat FILES -- AS 12/2011  
       REAL*8, DIMENSION(:,:,:,:,:), ALLOCATABLE :: gasi, gasv
-      REAL*8, DIMENSION(:), ALLOCATABLE :: PGASREF, TGASREF, WREFVAR, PFGASREF
+      REAL*8, DIMENSION(:), ALLOCATABLE :: PGASREF, TGASREF, WREFVAR, PFGASREF, GWEIGHT
       real*8 FZEROI(L_NSPECTI)
       real*8 FZEROV(L_NSPECTV)
@@ -129 +129 @@
       real*8,parameter :: UBARI = 0.5D0
 
-      real*8,save :: gweight(L_NGAUSS)
 !$OMP THREADPRIVATE(QREFvis,QREFir,omegaREFvis,omegaREFir,&     ! gweight read by master in sugas_corrk
                 !$OMP tstellar,planckir,PTOP)

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

@@ -63 +63 @@
       ! These are set in sugas_corrk
       ! [uses allocatable arrays] -- AS 12/2011
-      integer :: L_NPREF, L_NTREF, L_REFVAR, L_PINT   !L_NPREF, L_NTREF, L_REFVAR, L_PINT read by master in sugas_corrk
-
-      integer, parameter :: L_NGAUSS  = 17
+      integer :: L_NPREF, L_NTREF, L_REFVAR, L_PINT, L_NGAUSS  !L_NPREF, L_NTREF, L_REFVAR, L_PINT, L_NGAUSS read by master in sugas_corrk
 
       integer, parameter :: L_NSPECTI = NBinfrared

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

@@ -38 +38 @@
 
       integer n, nt, np, nh, ng, nw, m, i
-      integer L_NGAUSScheck
 
       character(len=200) :: file_id
@@ -160 +159 @@
       ! check the array size is correct, load the coefficients
       open(111,file=TRIM(file_path),form='formatted')
-      read(111,*) L_NGAUSScheck
-      if(.not.(L_NGAUSScheck.eq.L_NGAUSS)) then
-         print*,'The size of your radiative transfer g-space array does '
-         print*,'not match the value given in g.dat, exiting.'
-         call abort
-      endif
+      read(111,*) L_NGAUSS
+      IF( .NOT. ALLOCATED( gweight ) ) ALLOCATE( GWEIGHT(L_NGAUSS) )
       read(111,*) gweight
       close(111)