added hapi approximation to GAAS

CharlieCallahan · Jan 22, 2024 · 9e10021 · 9e10021
1 parent 977bb1d
commit 9e10021
Show file tree

Hide file tree

Showing 4 changed files with 323 additions and 311 deletions.
diff --git a/example_ocl.py b/example_ocl.py
@@ -28,10 +28,10 @@
 import published_validation.hapiValidationFunctions as hvf
 import gaas_ocl as gs
 
-startWavenum = 7200
-endWavenum = 7600
-wavenumStep = 0.001 #wavenums per simulation step
-mol = 'CH4' #'O3', 'N2O', 'CO', 'CH4', 'O2', 'NO', 'SO2', 'NO2', 'NH3', 'HNO3'
+startWavenum = 7300
+endWavenum = 7400
+wavenumStep = 0.01 #wavenums per simulation step
+mol = 'H2O' #'O3', 'N2O', 'CO', 'CH4', 'O2', 'NO', 'SO2', 'NO2', 'NH3', 'HNO3'
 iso = 1 #isotopologue num
 T = 296 #K
 P = 1.0 #atm
@@ -89,7 +89,7 @@ def getError(nus_h,coefs_h,nus_g,coefs_g):
 
 ax1.plot(nus,coefs)
 ax1.plot(nus_h,coefs_h)
-plt.xlim(7425,7455)
+# plt.xlim(7425,7455)
 ax1.legend(("GAAS","HAPI"))
 ax1.set_ylabel("Absorbance")
 

diff --git a/hapi.py b/hapi.py
@@ -17824,9 +17824,9 @@ def hum1_wei(x,y,n=24):
     cerf = 1j*z/sqrt(pi)/(z**2-0.5)
     """
 
-    # mask = abs(x)+y<15.0
+    mask = abs(x)+y<15.0
     #Adjusted to remove the approximation for comparison with GAAS
-    mask = (np.zeros_like(x) == 0) #array of "True"
+    # mask = (np.zeros_like(x) == 0) #array of "True"
     if any(mask):
         w24 = weideman(x[mask],y[mask],n)
         place(cerf,mask,w24)