Merge pull request #25 from SatCloP/rose_update

Add R23 and R24 absorption model, minor fixes
SatCloP · Jul 12, 2024 · 56ebc30 · 56ebc30
2 parents 7f385de + aee0be6
commit 56ebc30
Show file tree

Hide file tree

Showing 15 changed files with 990 additions and 772 deletions.
diff --git a/pyrtlib/_lineshape/h2o_lineshape.nc b/pyrtlib/_lineshape/h2o_lineshape.nc
diff --git a/pyrtlib/_lineshape/h2oll.py b/pyrtlib/_lineshape/h2oll.py
@@ -78,14 +78,14 @@
     xh = mtx[:, 9]
     shs = mtx[:, 10] / 1000.0
     xhs = mtx[:, 11]
-if H2OAbsModel.model in ['R19', 'R19SD', 'R20', 'R20SD', 'R21SD', 'R22SD']:
+if H2OAbsModel.model in ['R19', 'R19SD', 'R20', 'R20SD', 'R21SD', 'R22SD', 'R23', 'R23SD', 'R24']:
     aair = mtx[:, 12]
     aself = mtx[:, 13]
-if H2OAbsModel.model in ['R19SD', 'R20SD', 'R21SD', 'R22SD']:
+if H2OAbsModel.model in ['R19SD', 'R20SD', 'R21SD', 'R22SD', 'R23', 'R23SD', 'R24']:
     w2 = mtx[:, 14] / 1000.0
-if H2OAbsModel.model in ['R19SD', 'R20SD', 'R22SD']:
+if H2OAbsModel.model in ['R19SD', 'R20SD', 'R22SD', 'R23', 'R23SD', 'R24']:
     w2s = mtx[:, 15] / 1000.0
-if H2OAbsModel.model in ['R21SD', 'R22SD']:
+if H2OAbsModel.model in ['R21SD', 'R22SD', 'R23', 'R23SD', 'R24']:
     xw2 = mtx[:, 15]
     w2s = mtx[:, 16] / 1000.0
     xw2s = mtx[:, 17]

diff --git a/pyrtlib/_lineshape/o2_lineshape.nc b/pyrtlib/_lineshape/o2_lineshape.nc
diff --git a/pyrtlib/_lineshape/o2ll.py b/pyrtlib/_lineshape/o2ll.py
@@ -43,9 +43,11 @@
 w300 = d.variables['w300'][:].data
 if O2AbsModel.model in ['R98', 'R03', 'R17', 'R18', 'R19', 'R19SD']:
     v = d.variables['v'][:].data
+if O2AbsModel.model in ['R98', 'R03', 'R17', 'R18', 'R19', 'R19SD', 'R23', 'R24']:
     y300 = d.variables['y300'][:].data
-else:
+if O2AbsModel.model not in ['R98', 'R03', 'R17', 'R18', 'R19', 'R19SD', 'R23', 'R24']:
     y0 = d.variables['y0'][:].data
+if O2AbsModel.model in ['R16', 'R20', 'R20SD', 'R21', 'R22', 'R23', 'R24']:
     y1 = d.variables['y1'][:].data
     g0 = d.variables['g0'][:].data
     g1 = d.variables['g1'][:].data

diff --git a/pyrtlib/_lineshape/o3_lineshape.nc b/pyrtlib/_lineshape/o3_lineshape.nc
diff --git a/pyrtlib/absorption_model.py b/pyrtlib/absorption_model.py
diff --git a/pyrtlib/rt_equation.py b/pyrtlib/rt_equation.py
@@ -561,7 +561,7 @@ def clearsky_absorption(p: np.ndarray, t: np.ndarray, e: np.ndarray, frq: np.nda
                 raise ValueError(
                     'No model avalaible with this name: {} . Sorry...'.format('model'))
 
-            if isinstance(o3n, np.ndarray) and O3AbsModel.model in ['R18', 'R21', 'R21SD', 'R22', 'R22SD']:
+            if isinstance(o3n, np.ndarray) and O3AbsModel.model in ['R18', 'R21', 'R21SD', 'R22', 'R22SD', 'R23', 'R23SD', 'R24']:
                 aO3[i] = O3AbsModel().o3_absorption(t[i], p[i], frq, o3n[i], amu)
 
             adry[i] = aO2[i] + aN2[i] + aO3[i]