From 8d6fa46c043b89ec8b2e4dad6afc23a0675bae4e Mon Sep 17 00:00:00 2001 From: Jorn Bruggeman Date: Thu, 3 Oct 2024 14:37:18 +0100 Subject: [PATCH] bb/gas: unit correction; improve parameter description --- src/models/bb/gas/gas.F90 | 24 ++++++------- testcases/fabm-bb-gas.yaml | 72 +++++++++++++++++++------------------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/models/bb/gas/gas.F90 b/src/models/bb/gas/gas.F90 index e764b1c5..007095e9 100644 --- a/src/models/bb/gas/gas.F90 +++ b/src/models/bb/gas/gas.F90 @@ -30,18 +30,18 @@ subroutine initialize(self, configunit) call self%register_implemented_routines((/source_do_surface/)) - call self%get_parameter(self%A, 'A', '', 'coefficient A for Schmidt number polynomial') - call self%get_parameter(self%B, 'B', '', 'coefficient B for Schmidt number polynomial') - call self%get_parameter(self%C, 'C', '', 'coefficient C for Schmidt number polynomial') - call self%get_parameter(self%D, 'D', '', 'coefficient D for Schmidt number polynomial') - call self%get_parameter(self%E, 'E', '', 'coefficient E for Schmidt number polynomial') - call self%get_parameter(self%a1, 'a1', '', 'coefficient a1 for solubility function') - call self%get_parameter(self%a2, 'a2', '', 'coefficient a2 for solubility function') - call self%get_parameter(self%a3, 'a3', '', 'coefficient a3 for solubility function') - call self%get_parameter(self%a4, 'a4', '', 'coefficient a4 for solubility function') - call self%get_parameter(self%b1, 'b1', '', 'coefficient b1 for solubility function') - call self%get_parameter(self%b2, 'b2', '', 'coefficient b2 for solubility function') - call self%get_parameter(self%b3, 'b3', '', 'coefficient b3 for solubility function') + call self%get_parameter(self%A, 'A', '', 'coefficient A for Schmidt number polynomial (Table 1 in https://doi.org/10.5194/gmd-10-2169-2017)') + call self%get_parameter(self%B, 'B', '', 'coefficient B for Schmidt number polynomial (Table 1 in https://doi.org/10.5194/gmd-10-2169-2017)') + call self%get_parameter(self%C, 'C', '', 'coefficient C for Schmidt number polynomial (Table 1 in https://doi.org/10.5194/gmd-10-2169-2017)') + call self%get_parameter(self%D, 'D', '', 'coefficient D for Schmidt number polynomial (Table 1 in https://doi.org/10.5194/gmd-10-2169-2017)') + call self%get_parameter(self%E, 'E', '', 'coefficient E for Schmidt number polynomial (Table 1 in https://doi.org/10.5194/gmd-10-2169-2017)') + call self%get_parameter(self%a1, 'a1', '', 'coefficient a1 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017)', scale_factor=1000.0_rk) + call self%get_parameter(self%a2, 'a2', '', 'coefficient a2 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017)', scale_factor=1000.0_rk) + call self%get_parameter(self%a3, 'a3', '', 'coefficient a3 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017)', scale_factor=1000.0_rk) + call self%get_parameter(self%a4, 'a4', '', 'coefficient a4 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017)', scale_factor=1000.0_rk) + call self%get_parameter(self%b1, 'b1', '', 'coefficient b1 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017)', scale_factor=1000.0_rk) + call self%get_parameter(self%b2, 'b2', '', 'coefficient b2 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017)', scale_factor=1000.0_rk) + call self%get_parameter(self%b3, 'b3', '', 'coefficient b3 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017)', scale_factor=1000.0_rk) write(*,*) "Schmidt number at 20 degrees Celsius:", Schmidt_number(self, 20.0_rk) diff --git a/testcases/fabm-bb-gas.yaml b/testcases/fabm-bb-gas.yaml index 9faf57aa..3909424a 100644 --- a/testcases/fabm-bb-gas.yaml +++ b/testcases/fabm-bb-gas.yaml @@ -2,45 +2,45 @@ instances: cfc11: model: bb/gas # model type parameters: - A: 3579.2 # coefficient A for Schmidt number polynomial - B: -222.63 # coefficient B for Schmidt number polynomial - C: 7.57490000E+00 # coefficient C for Schmidt number polynomial - D: -1.45950000E-01 # coefficient D for Schmidt number polynomial - E: 1.18740000E-03 # coefficient E for Schmidt number polynomial - a1: -2.29926100E+02 # coefficient a1 for solubility function - a2: 3.19655200E+02 # coefficient a2 for solubility function - a3: 1.19447100E+02 # coefficient a3 for solubility function - a4: -1.39165000E+00 # coefficient a4 for solubility function - b1: -1.42382000E-01 # coefficient b1 for solubility function - b2: 9.14590000E-02 # coefficient b2 for solubility function - b3: -1.57274000E-02 # coefficient b3 for solubility function + A: 3579.2 # coefficient A for Schmidt number polynomial (Table 1 in https://doi.org/10.5194/gmd-10-2169-2017) + B: -222.63 # coefficient B for Schmidt number polynomial (Table 1 in https://doi.org/10.5194/gmd-10-2169-2017) + C: 7.57490000E+00 # coefficient C for Schmidt number polynomial (Table 1 in https://doi.org/10.5194/gmd-10-2169-2017) + D: -1.45950000E-01 # coefficient D for Schmidt number polynomial (Table 1 in https://doi.org/10.5194/gmd-10-2169-2017) + E: 1.18740000E-03 # coefficient E for Schmidt number polynomial (Table 1 in https://doi.org/10.5194/gmd-10-2169-2017) + a1: -2.29926100E+02 # coefficient a1 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017) + a2: 3.19655200E+02 # coefficient a2 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017) + a3: 1.19447100E+02 # coefficient a3 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017) + a4: -1.39165000E+00 # coefficient a4 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017) + b1: -1.42382000E-01 # coefficient b1 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017) + b2: 9.14590000E-02 # coefficient b2 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017) + b3: -1.57274000E-02 # coefficient b3 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017) cfc12: model: bb/gas # model type parameters: - A: 3828.1 # coefficient A for Schmidt number polynomial - B: -249.86 # coefficient B for Schmidt number polynomial - C: 8.76030000E+00 # coefficient C for Schmidt number polynomial - D: -1.71600000E-01 # coefficient D for Schmidt number polynomial - E: 1.40800000E-03 # coefficient E for Schmidt number polynomial - a1: -2.18097100E+02 # coefficient a1 for solubility function - a2: 2.98970200E+02 # coefficient a2 for solubility function - a3: 1.13804900E+02 # coefficient a3 for solubility function - a4: -1.39165000E+00 # coefficient a4 for solubility function - b1: -1.43566000E-01 # coefficient b1 for solubility function - b2: 9.10150000E-02 # coefficient b2 for solubility function - b3: -1.53924000E-02 # coefficient b3 for solubility function + A: 3828.1 # coefficient A for Schmidt number polynomial (Table 1 in https://doi.org/10.5194/gmd-10-2169-2017) + B: -249.86 # coefficient B for Schmidt number polynomial (Table 1 in https://doi.org/10.5194/gmd-10-2169-2017) + C: 8.76030000E+00 # coefficient C for Schmidt number polynomial (Table 1 in https://doi.org/10.5194/gmd-10-2169-2017) + D: -1.71600000E-01 # coefficient D for Schmidt number polynomial (Table 1 in https://doi.org/10.5194/gmd-10-2169-2017) + E: 1.40800000E-03 # coefficient E for Schmidt number polynomial (Table 1 in https://doi.org/10.5194/gmd-10-2169-2017) + a1: -2.18097100E+02 # coefficient a1 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017) + a2: 2.98970200E+02 # coefficient a2 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017) + a3: 1.13804900E+02 # coefficient a3 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017) + a4: -1.39165000E+00 # coefficient a4 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017) + b1: -1.43566000E-01 # coefficient b1 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017) + b2: 9.10150000E-02 # coefficient b2 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017) + b3: -1.53924000E-02 # coefficient b3 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017) sf6: model: bb/gas # model type parameters: - A: 3177.5 # coefficient A for Schmidt number polynomial - B: -200.57 # coefficient B for Schmidt number polynomial - C: 6.88650000E+00 # coefficient C for Schmidt number polynomial - D: -1.33350000E-01 # coefficient D for Schmidt number polynomial - E: 1.08770000E-03 # coefficient E for Schmidt number polynomial - a1: -8.00343000E+01 # coefficient a1 for solubility function - a2: 117.232 # coefficient a2 for solubility function - a3: 2.95817000E+01 # coefficient a3 for solubility function - a4: 0.0 # coefficient a4 for solubility function - b1: 3.35183000E-02 # coefficient b1 for solubility function - b2: -3.73942000E-02 # coefficient b2 for solubility function - b3: 7.74862000E-03 # coefficient b3 for solubility function + A: 3177.5 # coefficient A for Schmidt number polynomial (Table 1 in https://doi.org/10.5194/gmd-10-2169-2017) + B: -200.57 # coefficient B for Schmidt number polynomial (Table 1 in https://doi.org/10.5194/gmd-10-2169-2017) + C: 6.88650000E+00 # coefficient C for Schmidt number polynomial (Table 1 in https://doi.org/10.5194/gmd-10-2169-2017) + D: -1.33350000E-01 # coefficient D for Schmidt number polynomial (Table 1 in https://doi.org/10.5194/gmd-10-2169-2017) + E: 1.08770000E-03 # coefficient E for Schmidt number polynomial (Table 1 in https://doi.org/10.5194/gmd-10-2169-2017) + a1: -8.00343000E+01 # coefficient a1 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017) + a2: 117.232 # coefficient a2 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017) + a3: 2.95817000E+01 # coefficient a3 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017) + a4: 0.0 # coefficient a4 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017) + b1: 3.35183000E-02 # coefficient b1 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017) + b2: -3.73942000E-02 # coefficient b2 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017) + b3: 7.74862000E-03 # coefficient b3 for solubility function (Table 2 in https://doi.org/10.5194/gmd-10-2169-2017)