31 increase the pwv range in grid (#32)

* correct a bug which has been introduced previouslu where the PWV value was overwritten to 0 in libradtran input file. * correct bug on mol_modify for PWV in libsimulateVisible.py
LSSTDESC · Aug 27, 2024 · 0686fe2 · 0686fe2
1 parent 4376fbc
commit 0686fe2
Show file tree

Hide file tree

Showing 10 changed files with 186 additions and 716 deletions.
diff --git a/docs/notebooks/libradtranpy/visible/SimuRT_AbsPattern.ipynb b/docs/notebooks/libradtranpy/visible/SimuRT_AbsPattern.ipynb
diff --git a/docs/notebooks/libradtranpy/visible/SimuRT_MultiSitesAbsO2Pattern.ipynb b/docs/notebooks/libradtranpy/visible/SimuRT_MultiSitesAbsO2Pattern.ipynb
diff --git a/docs/notebooks/libradtranpy/visible/SimuRT_MultiSitesScattPattern.ipynb b/docs/notebooks/libradtranpy/visible/SimuRT_MultiSitesScattPattern.ipynb
diff --git a/docs/notebooks/libradtranpy/visible/SimuRT_MultiSitesTotalTransmission.ipynb b/docs/notebooks/libradtranpy/visible/SimuRT_MultiSitesTotalTransmission.ipynb
diff --git a/docs/notebooks/libradtranpy/visible/SimuRT_One.ipynb b/docs/notebooks/libradtranpy/visible/SimuRT_One.ipynb
diff --git a/docs/notebooks/libradtranpy/visible/SimuRT_ScattPattern.ipynb b/docs/notebooks/libradtranpy/visible/SimuRT_ScattPattern.ipynb
diff --git a/docs/notebooks/libradtranpy/visible/SimuRT_clouds.ipynb b/docs/notebooks/libradtranpy/visible/SimuRT_clouds.ipynb
diff --git a/docs/notebooks/libradtranpy/visible/SimuRT_vs_Airmass.ipynb b/docs/notebooks/libradtranpy/visible/SimuRT_vs_Airmass.ipynb
diff --git a/src/libradtranpy/libsimulateThermal.py b/src/libradtranpy/libsimulateThermal.py
@@ -457,7 +457,9 @@ def ProcessSimulation(airmass_num,pwv_num,oz_num,press_num,prof_str='us',proc_st
         if runtype=='no_absorption':
             uvspec.inp["no_absorption"] = ''
 
-        # set up the ozone value               
+        # set up the ozone value  
+        # Notice we have mol_modify key twice in libradtran input file,  
+        # But same key  in uvspec.inp dictionary would overwrite pwv            
         uvspec.inp["mol_modify"] = pwv_str
         uvspec.inp["mol_modify2"] = oz_str
 

diff --git a/src/libradtranpy/libsimulateVisible.py b/src/libradtranpy/libsimulateVisible.py
@@ -4,7 +4,8 @@
 
 :author: sylvielsstfr
 :creation date: November 2nd 2016
-:last update: February 20th 2024
+:update: February 20th 2024
+:last update : August 27th 2024 
 """
 
 import os
@@ -272,6 +273,8 @@ def ProcessSimulation(airmass_num, pwv_num, oz_num, press_num, aer_num, angstrom
 
     # water vapor
     pwv_str='H2O '+str(pwv_num)+ ' MM'
+    # try to solve the dictionnary with two identical keys
+    pwv_str2 = ' '+str(pwv_num)+ ' MM'
 
     # Ozone
     oz_str='O3 '+str(oz_num)+ ' DU'
@@ -311,9 +314,12 @@ def ProcessSimulation(airmass_num, pwv_num, oz_num, press_num, aer_num, angstrom
     if runtype=='no_absorption':
         uvspec.inp["no_absorption"] = ''
 
-    # set up the ozone value
-    uvspec.inp["mol_modify"] = pwv_str
-    uvspec.inp["mol_modify"] = oz_str #### BUGUGUGUGUGUGUGUG
+    # set up the PWV and ozone value
+    # Notice we have mol_modify key twice in libradtran input file, both for PWV and OZ 
+    # But same key  in uvspec.inp dictionary would overwrite pwv    
+    #uvspec.inp["mol_modify"] = pwv_str # OLD
+    uvspec.inp["mol_modify H2O"] = pwv_str2
+    uvspec.inp["mol_modify"] = oz_str #### BUGUGUGUGUGUGUGUG ==> No because overwrite pwv. UVspec3 manage the same tag for PWV and OZ
 
     # rescale pressure if reasonable pressure values are provided
     if press_num > 200. and press_num < 1080.: