Changeset 1122

Timestamp:

Dec 6, 2013, 1:01:19 AM (11 years ago)

Author:

jleconte

Message:

05/12/2013 == JL

• corrected sugascorrk to work in the two band gray aproximation with -b 1x1 and NGAUSS=2

Location:

trunk/LMDZ.GENERIC

Files:

• README (modified) (1 diff)
• libf/phystd/sugas_corrk.F90 (modified) (6 diffs)

trunk/LMDZ.GENERIC/README

@@ -998 +998 @@
 - First step for rayleigh with variable species. Now, just need to change optcv.
 - changed some interpolation indices in callcorrk to limit dependency of OLR on the number of layers
+
+== 05/12/2013 == JL
+- corrected sugascorrk to work in the two band gray aproximation with -b 1x1 and NGAUSS=2

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

@@ -50 +50 @@
       real*8 x, xi(4), yi(4), ans, p
 !     For gray case (JL12)
-      real kappa_IR, kappa_VI, IR_VI_wnlimit, nVI_limit,nIR_limit
+      real kappa_IR, kappa_VI, IR_VI_wnlimit
+      integer nVI_limit,nIR_limit
 
       integer ngas, igas, jgas
@@ -102 +103 @@
       do igas=1,ngas
          read(111,*) gastype(igas)
-         print*,'Gas ',igas,' is ',gastype(igas)
+         print*,'Gas ',igas,' is ',gastype(igas+      real kappa_IR, kappa_VI, IR_VI_wnlimit
+)
       enddo
 
@@ -276 +278 @@
 !=======================================================================
 !     Get gaseous k-coefficients and interpolate onto finer pressure grid
+
+
+!        wavelength used to separate IR from VI in graybody. We will need that anyway
+         IR_VI_wnlimit=3000.
+         write(*,*)"graybody: Visible / Infrared separation set at",10000./IR_VI_wnlimit,"um"
+         
+         nVI_limit=0
+         Do nw=1,L_NSPECTV
+            if ((WNOV(nw).gt.IR_VI_wnlimit).and.(L_NSPECTV.gt.1)) then
+               nVI_limit=nw-1
+               exit
+            endif
+         End do
+         nIR_limit=L_NSPECTI
+         Do nw=1,L_NSPECTI
+            if ((WNOI(nw).gt.IR_VI_wnlimit).and.(L_NSPECTI.gt.1)) then
+               nIR_limit=nw-1
+               exit
+            endif
+         End do
 
       if (graybody) then
@@ -291 +313 @@
          write(*,*)" kappa_IR = ",kappa_IR       
          kappa_IR=kappa_IR*1.e4* mugaz * 1.672621e-27    ! conversion from m^2/kg to cm^2/molecule 
+
+         write(*,*)"graybody: Visible / Infrared separation set at band: IR=",nIR_limit,", VI=",nVI_limit
                
-!        wavelength used to separate IR from VI
-         IR_VI_wnlimit=3000.
-         write(*,*)"graybody: Visible / Infrared separation set at",10000./IR_VI_wnlimit,"um"
-         
-         nVI_limit=L_NSPECTV
-         Do nw=1,L_NSPECTV
-            if (WNOV(nw).gt.IR_VI_wnlimit) then
-               nVI_limit=nw-1
-               exit
-            endif
-         End do
-         nIR_limit=L_NSPECTI
-         Do nw=1,L_NSPECTI
-            if (WNOI(nw).gt.IR_VI_wnlimit) then
-               nIR_limit=nw-1
-               exit
-            endif
-         End do
-         write(*,*)"graybody: Visible / Infrared separation set at band ",nIR_limit,nVI_limit
-              
+      Else
+         kappa_VI=1.e-30      
+         kappa_IR=1.e-30        
       End if
 
-
+!      print*,corrkdir(1:4)
       ! VISIBLE
-      if (callgasvis.and.(.not.TRIM(corrkdir).eq.'null').and.(.not.TRIM(corrkdir).eq.'null_LowTeffStar').and.(.not.graybody)) then
-         file_id='/corrk_data/'//trim(adjustl(banddir))//'/corrk_gcm_VI.dat' 
-         file_path=TRIM(datadir)//TRIM(file_id)
+      if (callgasvis) then
+         if ((corrkdir(1:4).eq.'null'))then   !(TRIM(corrkdir).eq.'null_LowTeffStar')) then
+            gasv8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,1:L_NSPECTV,1:L_NGAUSS)=0.0
+            print*,'using no corrk data'
+            print*,'Visible corrk gaseous absorption is set to zero if graybody=F'
+         else
+            file_id='/corrk_data/'//trim(adjustl(banddir))//'/corrk_gcm_VI.dat' 
+            file_path=TRIM(datadir)//TRIM(file_id)
+            
+            ! check that the file exists
+            inquire(FILE=file_path,EXIST=file_ok)
+            if(.not.file_ok) then
+               write(*,*)'The file ',TRIM(file_path)
+               write(*,*)'was not found by sugas_corrk.F90.'
+               write(*,*)'Are you sure you have absorption data for these bands?'
+               call abort
+            endif
          
-         ! check that the file exists
-         inquire(FILE=file_path,EXIST=file_ok)
-         if(.not.file_ok) then
-            write(*,*)'The file ',TRIM(file_path)
-            write(*,*)'was not found by sugas_corrk.F90.'
-            write(*,*)'Are you sure you have absorption data for these bands?'
-            call abort
-         endif
-         
-         open(111,file=TRIM(file_path),form='formatted')
-         read(111,*) gasv8
-         close(111)
-
-      else if (callgasvis.and.graybody) then
+            open(111,file=TRIM(file_path),form='formatted')
+            read(111,*) gasv8
+            close(111)
+         end if
+
          if(nVI_limit.eq.0) then
-            gasv8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,1:L_NSPECTV,1:L_NGAUSS)=kappa_VI
+            gasv8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,1:L_NSPECTV,1:L_NGAUSS)=   &
+                  gasv8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,1:L_NSPECTV,1:L_NGAUSS)+kappa_VI
          else if (nVI_limit.eq.L_NSPECTV) then
-            gasv8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,1:L_NSPECTV,1:L_NGAUSS)=kappa_IR
+            gasv8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,1:L_NSPECTV,1:L_NGAUSS)=   &
+                  gasv8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,1:L_NSPECTV,1:L_NGAUSS)+kappa_IR
          else
-            gasv8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,1:nVI_limit,1:L_NGAUSS)=kappa_IR
-            gasv8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,nVI_limit+1:L_NSPECTV,1:L_NGAUSS)=kappa_VI
+            gasv8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,1:nVI_limit,1:L_NGAUSS)=   &
+                  gasv8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,1:nVI_limit,1:L_NGAUSS)+kappa_IR
+            gasv8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,nVI_limit+1:L_NSPECTV,1:L_NGAUSS)=   &
+                  gasv8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,nVI_limit+1:L_NSPECTV,1:L_NGAUSS)+kappa_VI
          end if
       else
@@ -348 +364 @@
 
       ! INFRA-RED
-      if ((.not.TRIM(corrkdir).eq.'null').and.(.not.TRIM(corrkdir).eq.'null_LowTeffStar').and.(.not.graybody)) then
+      if ((corrkdir(1:4).eq.'null'))then       !.or.(TRIM(corrkdir).eq.'null_LowTeffStar')) then
+         print*,'Infrared corrk gaseous absorption is set to zero if graybody=F'
+         gasi8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,1:L_NSPECTI,1:L_NGAUSS)=0.0
+      else  
          file_id='/corrk_data/'//trim(adjustl(banddir))//'/corrk_gcm_IR.dat' 
          file_path=TRIM(datadir)//TRIM(file_id)
@@ -403 +422 @@
          end do
 
-      else if (graybody) then
-         if(nIR_limit.eq.0) then
-            gasi8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,1:L_NSPECTI,1:L_NGAUSS)=kappa_VI
-         else if (nIR_limit.eq.L_NSPECTI) then
-            gasi8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,1:L_NSPECTI,1:L_NGAUSS)=kappa_IR
-         else
-            gasi8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,1:nIR_limit,1:L_NGAUSS)=kappa_IR
-            gasi8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,nIR_limit+1:L_NSPECTI,1:L_NGAUSS)=kappa_VI
-         end if
+      endif
+
+      if(nIR_limit.eq.0) then
+         gasi8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,1:L_NSPECTI,1:L_NGAUSS)=   &
+                  gasi8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,1:L_NSPECTI,1:L_NGAUSS)+kappa_VI
+      else if (nIR_limit.eq.L_NSPECTI) then
+         gasi8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,1:L_NSPECTI,1:L_NGAUSS)=   &
+                  gasi8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,1:L_NSPECTI,1:L_NGAUSS)+kappa_IR
       else
-         print*,'Infrared corrk gaseous absorption is set to zero.'
-         gasi8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,1:L_NSPECTI,1:L_NGAUSS)=0.0
-      endif
+         gasi8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,1:nIR_limit,1:L_NGAUSS)=   &
+                  gasi8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,1:nIR_limit,1:L_NGAUSS)+kappa_IR
+         gasi8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,nIR_limit+1:L_NSPECTI,1:L_NGAUSS)=   &
+                  gasi8(1:L_NTREF,1:L_NPREF,1:L_REFVAR,nIR_limit+1:L_NSPECTI,1:L_NGAUSS)+kappa_VI
+      end if