From 9cad4ae5ab10a5b4ba9e9c84e619560be4f9103f Mon Sep 17 00:00:00 2001 From: whitetuft Date: Mon, 29 Apr 2024 17:05:39 +0200 Subject: [PATCH] [bug fixes] followup cd474d0 and fix build --- pyrtlib/_lineshape/h2o_lineshape.nc | Bin 54375 -> 59853 bytes pyrtlib/_lineshape/h2oll.py | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pyrtlib/_lineshape/h2o_lineshape.nc b/pyrtlib/_lineshape/h2o_lineshape.nc index 27839c0d097b7933b710ec6d0c9336bf0ea4ea5f..ddd797d4d19a453841f7c78c5f6b52a9a8db6589 100644 GIT binary patch delta 5377 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 Mo42T4=|^esZ(|XM-v9sr delta 5724 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 YB>!q2gpbbDYxwANxIu88KC_(v4b<`8)c^nh diff --git a/pyrtlib/_lineshape/h2oll.py b/pyrtlib/_lineshape/h2oll.py index eb770acf..3b051c81 100644 --- a/pyrtlib/_lineshape/h2oll.py +++ b/pyrtlib/_lineshape/h2oll.py @@ -66,14 +66,14 @@ w0s = mtx[:, 6] / 1000.0 xs = mtx[:, 7] if H2OAbsModel.model == 'R03': - w0s = mtx[:, 6] / 1000.0 - xs = mtx[:, 7] - sr = mtx[:, 8] + w0s = mtx[:, 7] / 1000.0 + xs = mtx[:, 8] + sr = mtx[:, 6] elif H2OAbsModel.model in ['R16', 'R17']: sr = mtx[:, 6] w0s = mtx[:, 7] / 1000.0 xs = mtx[:, 8] -if H2OAbsModel.model not in ['R98', 'R03']: +if H2OAbsModel.model not in ['R98', 'R03', 'R16', 'R17']: sh = mtx[:, 8] / 1000.0 xh = mtx[:, 9] shs = mtx[:, 10] / 1000.0