Changeset 2736 for trunk/LMDZ.GENERIC

Timestamp:

Jun 21, 2022, 11:24:14 AM (3 years ago)

Author:

aslmd

Message:

Changed of callcorrk to physiq_mod

Location:

trunk/LMDZ.GENERIC/libf/phystd

Files:

• callcorrk.F90 (modified) (1 diff)
• physiq_mod.F90 (modified) (5 diffs)

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

@@ -308 +308 @@
 !--------------------------------------------------
 
-
-         print*, "callcorrk: Correlated-k data base folder:",trim(datadir)
-         call getin_p("corrkdir",corrkdir)
-         print*, "corrkdir = ",corrkdir
-         write( tmp1, '(i3)' ) L_NSPECTI
-         write( tmp2, '(i3)' ) L_NSPECTV
-         banddir=trim(adjustl(tmp1))//'x'//trim(adjustl(tmp2))
-         banddir=trim(adjustl(corrkdir))//'/'//trim(adjustl(banddir))
-
-         call setspi            ! Basic infrared properties.
-         call setspv            ! Basic visible properties.
-         call sugas_corrk       ! Set up gaseous absorption properties.
-         call suaer_corrk       ! Set up aerosol optical properties.
+      !this block is now done at firstcall of physiq_mod
+         ! print*, "callcorrk: Correlated-k data base folder:",trim(datadir)
+         ! call getin_p("corrkdir",corrkdir)
+         ! print*, "corrkdir = ",corrkdir
+         ! write( tmp1, '(i3)' ) L_NSPECTI
+         ! write( tmp2, '(i3)' ) L_NSPECTV
+         ! banddir=trim(adjustl(tmp1))//'x'//trim(adjustl(tmp2))
+         ! banddir=trim(adjustl(corrkdir))//'/'//trim(adjustl(banddir))
+
+         ! call setspi            ! Basic infrared properties.
+         ! call setspv            ! Basic visible properties.
+         ! call sugas_corrk       ! Set up gaseous absorption properties.
+         ! call suaer_corrk       ! Set up aerosol optical properties.
         
 

trunk/LMDZ.GENERIC/libf/phystd/physiq_mod.F90 ¶

@@ -15 +15 @@
 
       use ioipsl_getin_p_mod, only: getin_p 
-      use radinc_h, only : L_NSPECTI,L_NSPECTV,naerkind
+      use radinc_h, only : L_NSPECTI,L_NSPECTV,naerkind, corrkdir, banddir
       use watercommon_h, only : RLVTT, Psat_water,epsi,su_watercycle, RV, T_h2o_ice_liq
       use generic_cloud_common_h, only : epsi_generic, Psat_generic
       use thermcell_mod, only: init_thermcell_mod
       use gases_h, only: gnom, gfrac
-      use radcommon_h, only: sigma, glat, grav, BWNV, WNOI,DWNI,DWNV,WNOV
+      use radcommon_h, only: sigma, glat, grav, BWNV, WNOI, DWNI, DWNV, WNOV
       use radii_mod, only: h2o_reffrad, co2_reffrad
       use aerosol_mod, only: iaero_co2, iaero_h2o
@@ -74 +74 @@
       use mass_redistribution_mod, only: mass_redistribution
       use condensation_generic_mod, only: condensation_generic 
+      use datafile_mod, only: datadir
 #ifndef MESOSCALE
       use vertical_layers_mod, only: presnivs, pseudoalt
@@ -468 +469 @@
       ! Misc
       character*2 :: str2
+      character(len=10) :: tmp1 
+      character(len=10) :: tmp2
 !==================================================================================================
 
@@ -739 +742 @@
          endif
 #endif         
-         
+         if (corrk) then 
+            ! We initialise the spectral grid here instead of 
+            ! at firstcall of callcorrk so we can output XspecIR, XspecVI 
+            ! when using Dynamico
+            print*, "physiq_mod: Correlated-k data base folder:",trim(datadir)
+            call getin_p("corrkdir",corrkdir)
+            print*,"corrkdir = ", corrkdir
+            write (tmp1, '(i3)') L_NSPECTI
+            write (tmp2, '(i3)') L_NSPECTV
+            banddir=trim(trim(adjustl(tmp1))//'x'//trim(adjustl(tmp2)))
+            banddir=trim(trim(adjustl(corrkdir))//'/'//trim(adjustl(banddir)))
+            call setspi !Basic infrared properties.
+            call setspv ! Basic visible properties.
+            call sugas_corrk       ! Set up gaseous absorption properties.
+            call suaer_corrk       ! Set up aerosol optical properties.
+         endif
          ! XIOS outputs
 #ifdef CPP_XIOS
@@ -745 +763 @@
          write(*,*) "physiq: call initialize_xios_output"
          call initialize_xios_output(pday,ptime,ptimestep,daysec, &
-                                     year_day,presnivs,pseudoalt)
+                                     year_day,presnivs,pseudoalt,WNOI,WNOV)
 #endif
          write(*,*) "physiq: end of firstcall"