Changeset 2062 for trunk

Timestamp:

Jan 9, 2019, 4:52:32 PM (6 years ago)

Author:

aboissinot

Message:

Add keys (optprop_back2lay_vis, optprop_back2lay_ir) to set aeroback2lay aerosol optprop ir and visible files names
and solve the name conflict between Saturn and Jupiter.
Default values are the previously hard coded values, respectively 'optprop_saturn_vis_n20.dat' and 'optprop_saturn_ir_n20'.

Location:

trunk/LMDZ.GENERIC

Files:

• README (modified) (1 diff)
• libf/phystd/callkeys_mod.F90 (modified) (1 diff)
• libf/phystd/inifis_mod.F90 (modified) (1 diff)
• libf/phystd/suaer_corrk.F90 (modified) (4 diffs)

trunk/LMDZ.GENERIC/README

@@ -1423 +1423 @@
 == 09/01/2018 == AB
 - Add the thermal plume model (cf. Rio et al. 2010) extended to gas giant. Specific parameters are set in thermcell_mod.
-
+- Add keys (back2lay_visname, back2lay_irname) to set aeroback2lay aerosol optprop files names and solve the name conflict between Saturn and Jupiter.
+  Default values are the previously hard coded values.

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

@@ -78 +78 @@
       real,save :: obs_tau_col_strato
 !$OMP THREADPRIVATE(Tstrat,tplanet,obs_tau_col_tropo,obs_tau_col_strato)
+      character(64),save :: optprop_back2lay_vis
+      character(64),save :: optprop_back2lay_ir
       real,save :: pres_bottom_tropo
       real,save :: pres_top_tropo

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

@@ -553 +553 @@
      write(*,*)" obs_tau_col_strato = ",obs_tau_col_strato
 
+     write(*,*)"TWOLAY AEROSOL: optprop_back2lay_vis?"
+     optprop_back2lay_vis = 'optprop_saturn_vis_n20.dat'
+     call getin_p("optprop_back2lay_vis",optprop_back2lay_vis)
+     write(*,*)" optprop_back2lay_vis = ",optprop_back2lay_vis
+
+     write(*,*)"TWOLAY AEROSOL: optprop_back2lay_ir?"
+     optprop_back2lay_ir = 'optprop_saturn_ir_n20.dat'
+     call getin_p("optprop_back2lay_ir",optprop_back2lay_ir)
+     write(*,*)" optprop_back2lay_ir = ",optprop_back2lay_ir
+     
      write(*,*)"TWOLAY AEROSOL: pres_bottom_tropo? in pa"
      pres_bottom_tropo=66000.0

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

@@ -11 +11 @@
       use radcommon_h, only: qrefvis,qrefir,omegarefir !,omegarefvis
       use aerosol_mod
-      use callkeys_mod, only: tplanet
+      use callkeys_mod, only: tplanet, optprop_back2lay_vis, optprop_back2lay_ir
 
       implicit none
@@ -67 +67 @@
       INTEGER :: idomain        ! Domain index (1=VIS,2=IR)
       INTEGER :: ilw            ! longwave index
-      INTEGER :: isw           ! shortwave index
+      INTEGER :: isw            ! shortwave index
       INTEGER :: isize          ! Particle size index
       INTEGER :: jfile          ! ASCII file scan index
@@ -171 +171 @@
        if (iaer.eq.iaero_back2lay) then
          print*, 'naerkind= back2lay', iaer
-
-!     visible
-         file_id(iaer,1) = 'optprop_saturn_vis_n20.dat'
+         
+!     visible
+         file_id(iaer,1) = TRIM(optprop_back2lay_vis)
          lamrefvis(iaer)=0.8E-6  ! 
 !     infrared
-         file_id(iaer,2) = 'optprop_saturn_ir_n20.dat'
+         file_id(iaer,2) = TRIM(optprop_back2lay_ir)
          lamrefir(iaer)=6.E-6  ! 
 ! added by SG
@@ -192 +192 @@
 ! added by SG
        endif
-
 
        if (iaer.eq.iaero_aurora) then