allow more than 2 T intervals for thermo data

Nicholaswogan · Oct 27, 2023 · 5287254 · 5287254
1 parent 8646a42
commit 5287254
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/clima_types_create.f90 b/src/clima_types_create.f90
@@ -271,7 +271,7 @@ subroutine unpack_thermo(molecule, molecule_name, infile, thermo, err)
     if (allocated(io_err)) then; err = trim(infile)//trim(io_err%message); return; endif
 
     thermo%ntemps = tmplist%size() - 1
-    if (thermo%ntemps /= 1 .and. thermo%ntemps /= 2) then
+    if (thermo%ntemps < 1) then
       err = "Problem reading thermodynamic data for "//trim(molecule_name)
       return
     endif

diff --git a/templates/EarlyMars/species.yaml b/templates/EarlyMars/species.yaml
@@ -53,11 +53,12 @@ species:
   composition: {H: 2}
   thermo:
     model: Shomate
-    temperature-ranges: [0.0, 1000.0, 2500.0]
+    temperature-ranges: [0.0, 1000.0, 2500.0, 6000.0]
     data:
     - [33.066178, -11.36342, 11.432816, -2.772874, -0.158558, -9.980797,
       172.708]
     - [18.563083, 12.257357, -2.859786, 0.268238, 1.97799, -1.147438, 156.2881]
+    - [43.41356, -4.293079, 1.272428, -0.096876, -20.53386, -38.51515, 162.0814]
   note: From the NIST database
 - name: CH4
   composition: {C: 1, H: 4}

diff --git a/templates/ModernEarth/species.yaml b/templates/ModernEarth/species.yaml
@@ -61,11 +61,12 @@ species:
 #   composition: {H: 2}
 #   thermo:
 #     model: Shomate
-#     temperature-ranges: [0.0, 1000.0, 2500.0]
+#     temperature-ranges: [0.0, 1000.0, 2500.0, 6000.0]
 #     data:
 #     - [33.066178, -11.36342, 11.432816, -2.772874, -0.158558, -9.980797,
 #       172.708]
 #     - [18.563083, 12.257357, -2.859786, 0.268238, 1.97799, -1.147438, 156.2881]
+#     - [43.41356, -4.293079, 1.272428, -0.096876, -20.53386, -38.51515, 162.0814]
 #   note: From the NIST database
 # - name: CO
 #   composition: {C: 1, O: 1}