Revised extrapolation of emissivity.

slcs-jsc · Jan 4, 2024 · 6567104 · 6567104
1 parent b281192
commit 6567104
Show file tree

Hide file tree

Showing 14 changed files with 5,932 additions and 5,924 deletions.
diff --git a/example/limb/kernel.org b/example/limb/kernel.org
diff --git a/example/limb/kernel.tab b/example/limb/kernel.tab
diff --git a/example/limb/plot_kernel_CCl4_792.png b/example/limb/plot_kernel_CCl4_792.png
diff --git a/example/limb/plot_kernel_CO2_792.png b/example/limb/plot_kernel_CO2_792.png
diff --git a/example/limb/plot_kernel_H2O_792.png b/example/limb/plot_kernel_H2O_792.png
diff --git a/example/limb/plot_kernel_O3_792.png b/example/limb/plot_kernel_O3_792.png
diff --git a/example/limb/plot_kernel_extinction_792.png b/example/limb/plot_kernel_extinction_792.png
diff --git a/example/limb/plot_kernel_pressure_792.png b/example/limb/plot_kernel_pressure_792.png
diff --git a/example/limb/plot_kernel_temperature_792.png b/example/limb/plot_kernel_temperature_792.png
diff --git a/example/limb/plot_rad.png b/example/limb/plot_rad.png
diff --git a/example/limb/plot_tau.png b/example/limb/plot_tau.png
diff --git a/example/limb/rad.org b/example/limb/rad.org
@@ -13,11 +13,11 @@
 # $13 = transmittance (792.0000 cm^-1) [-]
 # $14 = transmittance (832.0000 cm^-1) [-]
 
-0.00 780 0 0 3 0 26.9643 1.48665 -2.77074e-08 27.4458 0.0429404 0.0763938 5.69201e-12 7.97897e-07
-0.00 780 0 0 4 0 26.9466 2.66137 -2.41304e-08 27.3738 0.0423131 0.073309 1.43642e-06 0.00474822
-0.00 780 0 0 5 0 26.9289 3.81883 -2.09905e-08 27.3061 0.0415876 0.0608964 0.000164961 0.108526
-0.00 780 0 0 6 0 26.9112 4.95253 -1.83892e-08 27.2469 0.0406685 0.0364349 0.00134863 0.393758
-0.00 780 0 0 7 0 26.8935 6.07345 -1.60942e-08 27.1921 0.0395392 0.016995 0.0035704 0.670956
+0.00 780 0 0 3 0 26.9643 1.48665 -2.77074e-08 27.4458 0.0429344 0.0763938 2.59601e-17 7.97897e-07
+0.00 780 0 0 4 0 26.9466 2.66137 -2.41304e-08 27.3738 0.0423077 0.073309 1.47555e-13 0.00474822
+0.00 780 0 0 5 0 26.9289 3.81883 -2.09905e-08 27.3061 0.0416002 0.0608964 7.50909e-09 0.108526
+0.00 780 0 0 6 0 26.9112 4.95253 -1.83892e-08 27.2469 0.0407722 0.0364349 6.80256e-06 0.393758
+0.00 780 0 0 7 0 26.8935 6.07345 -1.60942e-08 27.1921 0.0397073 0.016995 0.000551384 0.670956
 0.00 780 0 0 8 0 26.8757 7.17902 -1.416e-08 27.1461 0.0380266 0.00730141 0.00790156 0.832765
 0.00 780 0 0 9 0 26.858 8.27708 -1.23755e-08 27.1006 0.0358016 0.00330619 0.0259682 0.911455
 0.00 780 0 0 10 0 26.8403 9.36733 -1.07618e-08 27.0581 0.0332623 0.00165049 0.0575655 0.949749

diff --git a/example/limb/rad.tab b/example/limb/rad.tab
@@ -13,11 +13,11 @@
 # $13 = transmittance (792.0000 cm^-1) [-]
 # $14 = transmittance (832.0000 cm^-1) [-]
 
-0.00 780 0 0 3 0 26.9643 1.48665 -2.77074e-08 27.4458 0.0429404 0.0763938 5.69201e-12 7.97897e-07
-0.00 780 0 0 4 0 26.9466 2.66137 -2.41304e-08 27.3738 0.0423131 0.073309 1.43642e-06 0.00474822
-0.00 780 0 0 5 0 26.9289 3.81883 -2.09905e-08 27.3061 0.0415876 0.0608964 0.000164961 0.108526
-0.00 780 0 0 6 0 26.9112 4.95253 -1.83892e-08 27.2469 0.0406685 0.0364349 0.00134863 0.393758
-0.00 780 0 0 7 0 26.8935 6.07345 -1.60942e-08 27.1921 0.0395392 0.016995 0.0035704 0.670956
+0.00 780 0 0 3 0 26.9643 1.48665 -2.77074e-08 27.4458 0.0429344 0.0763938 2.59601e-17 7.97897e-07
+0.00 780 0 0 4 0 26.9466 2.66137 -2.41304e-08 27.3738 0.0423077 0.073309 1.47555e-13 0.00474822
+0.00 780 0 0 5 0 26.9289 3.81883 -2.09905e-08 27.3061 0.0416002 0.0608964 7.50909e-09 0.108526
+0.00 780 0 0 6 0 26.9112 4.95253 -1.83892e-08 27.2469 0.0407722 0.0364349 6.80256e-06 0.393758
+0.00 780 0 0 7 0 26.8935 6.07345 -1.60942e-08 27.1921 0.0397073 0.016995 0.000551384 0.670956
 0.00 780 0 0 8 0 26.8757 7.17902 -1.416e-08 27.1461 0.0380266 0.00730141 0.00790156 0.832765
 0.00 780 0 0 9 0 26.858 8.27708 -1.23755e-08 27.1006 0.0358016 0.00330619 0.0259682 0.911455
 0.00 780 0 0 10 0 26.8403 9.36733 -1.07618e-08 27.0581 0.0332623 0.00165049 0.0575655 0.949749

diff --git a/src/jurassic.c b/src/jurassic.c
@@ -3900,10 +3900,14 @@ double intpol_tbl_eps(
 	       u);
 
   /* Upper boundary... */
-  else if (u > tbl->u[id][ig][ip][it][tbl->nu[id][ig][ip][it] - 1])
-    return LIN(tbl->u[id][ig][ip][it][tbl->nu[id][ig][ip][it] - 1],
-	       tbl->eps[id][ig][ip][it][tbl->nu[id][ig][ip][it] - 1],
-	       UMAX, 1, u);
+  else if (u > tbl->u[id][ig][ip][it][tbl->nu[id][ig][ip][it] - 1]) {
+    double a =
+      log(1 -
+	  tbl->eps[id][ig][ip][it][tbl->nu[id][ig][ip][it] -
+				   1]) /
+      tbl->u[id][ig][ip][it][tbl->nu[id][ig][ip][it] - 1];
+    return 1 - exp(a * u);
+  }
 
   /* Interpolation... */
   else {
@@ -3935,10 +3939,14 @@ double intpol_tbl_u(
 	       eps);
 
   /* Upper boundary... */
-  else if (eps > tbl->eps[id][ig][ip][it][tbl->nu[id][ig][ip][it] - 1])
-    return LIN(tbl->eps[id][ig][ip][it][tbl->nu[id][ig][ip][it] - 1],
-	       tbl->u[id][ig][ip][it][tbl->nu[id][ig][ip][it] - 1],
-	       1, UMAX, eps);
+  else if (eps > tbl->eps[id][ig][ip][it][tbl->nu[id][ig][ip][it] - 1]) {
+    double a =
+      log(1 -
+	  tbl->eps[id][ig][ip][it][tbl->nu[id][ig][ip][it] -
+				   1]) /
+      tbl->u[id][ig][ip][it][tbl->nu[id][ig][ip][it] - 1];
+    return log(1 - eps) / a;
+  }
 
   /* Interpolation... */
   else {