From a8cbd3a5aee6f29962fdacac0b0887dedc04c085 Mon Sep 17 00:00:00 2001 From: Philipp Grete Date: Fri, 30 Aug 2024 15:45:23 +0200 Subject: [PATCH] Use single metallicity cooling tables --- CHANGELOG.md | 6 +- docs/cooling/cooling.ipynb | 63 +++++- docs/cooling/plot_lambda.py | 9 +- docs/input.md | 12 +- inputs/cloud.in | 4 +- inputs/cluster/cluster.in | 4 +- inputs/cluster/cooling.in | 4 +- inputs/cooling_tables/gnat-sternberg.cooling | 208 ----------------- .../gnat-sternberg.cooling_0.001Z | 209 ++++++++++++++++++ .../gnat-sternberg.cooling_0.01Z | 209 ++++++++++++++++++ .../gnat-sternberg.cooling_0.1Z | 209 ++++++++++++++++++ .../cooling_tables/gnat-sternberg.cooling_1Z | 209 ++++++++++++++++++ .../cooling_tables/gnat-sternberg.cooling_2Z | 209 ++++++++++++++++++ inputs/cooling_tables/schure.cooling_0.3Z | 111 ++++++++++ inputs/cooling_tables/schure.cooling_0.5Z | 111 ++++++++++ inputs/cooling_tables/schure.cooling_1.0Z | 111 ++++++++++ inputs/cooling_tables/updated_schure.cooling | 111 ---------- src/hydro/srcterms/tabular_cooling.cpp | 23 +- .../cluster_tabular_cooling.py | 2 - 19 files changed, 1473 insertions(+), 351 deletions(-) delete mode 100644 inputs/cooling_tables/gnat-sternberg.cooling create mode 100644 inputs/cooling_tables/gnat-sternberg.cooling_0.001Z create mode 100644 inputs/cooling_tables/gnat-sternberg.cooling_0.01Z create mode 100644 inputs/cooling_tables/gnat-sternberg.cooling_0.1Z create mode 100644 inputs/cooling_tables/gnat-sternberg.cooling_1Z create mode 100644 inputs/cooling_tables/gnat-sternberg.cooling_2Z create mode 100644 inputs/cooling_tables/schure.cooling_0.3Z create mode 100644 inputs/cooling_tables/schure.cooling_0.5Z create mode 100644 inputs/cooling_tables/schure.cooling_1.0Z delete mode 100644 inputs/cooling_tables/updated_schure.cooling diff --git a/CHANGELOG.md b/CHANGELOG.md index d8511658..17e1877b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,10 +6,10 @@ - [[PR 1]](https://github.com/parthenon-hpc-lab/athenapk/pull/1) Add isotropic thermal conduction and RKL2 supertimestepping ### Changed (changing behavior/API/variables/...) +- [[PR 97]](https://github.com/parthenon-hpc-lab/athenapk/pull/97) Fixed Schure cooling curve. Removed SD one. Added description of cooling function conventions. - [[PR 84]](https://github.com/parthenon-hpc-lab/athenapk/pull/84) Bump Parthenon to latest develop (2024-02-15) ### Fixed (not changing behavior/API/variables/...) -- [[PR 97]](https://github.com/parthenon-hpc-lab/athenapk/pull/97) Fixed Schure cooling curve. Removed SD one. Added description of cooling function conventions. ### Infrastructure - [[PR 112]](https://github.com/parthenon-hpc-lab/athenapk/pull/112) Add dev container configuration @@ -21,7 +21,9 @@ ### Incompatibilities (i.e. breaking changes) - [[PR 97]](https://github.com/parthenon-hpc-lab/athenapk/pull/97) - Removes original `schure.cooling` cooling curve as it had unknown origin. - - Added `updated_schure.cooling` curve (and associated notebook to calculate it from the paper tables). + - To avoid confusion, only cooling table for a single solar metallicity are supported + from now on (i.e., the parameters to specify temperature and lambda columns have been removed). + - Added `schure.cooling_#Z` curves (and associated notebook to calculate it from the paper tables). - [[PR 84]](https://github.com/parthenon-hpc-lab/athenapk/pull/84) Bump Parthenon to latest develop (2024-02-15) - Updated access to block dimension: `pmb->block_size.nx1` -> `pmb->block_size.nx(X1DIR)` (and similarly x2 and x3) - Update access to mesh size: `pmesh->mesh_size.x1max` -> `pmesh->mesh_size.xmax(X1DIR)` (and similarly x2, x3, and min) diff --git a/docs/cooling/cooling.ipynb b/docs/cooling/cooling.ipynb index 435a8a43..31b183b7 100644 --- a/docs/cooling/cooling.ipynb +++ b/docs/cooling/cooling.ipynb @@ -122,15 +122,14 @@ "source": [ "header=\"\"\"Cooling rates generated from Schure 2009 (doi.org/10.1051/0004-6361/200912495)\n", "containing temperatures in the first column (in log10 K) and collisional ionisation\n", - "equilibrium (CIE) cooling rates (in log10 erg cm^3/s) for Z=1 solar metalicity, Z=0.5,\n", - "and Z=0.3 across the columns. Cooling rates are in the convention Lambda_hd from eq. 1,\n", + "equilibrium (CIE) cooling rates (in log10 erg cm^3/s).\n", + "Cooling rates are in the convention Lambda_hd from eq. 1,\n", "where the proton ratio n_e/n_H is taken from table 2.\n", "Lambda_N is computed from eq. 3. The cooling rate Lambda_N(X_i,T) from eq. 3 is contained\n", "in table 4. n_i/n_i(solar) is taken to be 1.0 for all elements for Z=1 while for Z=0.5\n", - "and Z=0.5 n_i/n_i(solar) is set to 1 for H and He and set to 0.5 and 0.3 respectively for\n", + "and Z=0.3 n_i/n_i(solar) is set to 1 for H and He and set to 0.5 and 0.3 respectively for\n", "all other elements. Made by Forrest Glines (forrestglines@gmail.com)\n", - "-----------------------------------------------------------------------------------------\n", - "log10 T [K] Z=1 log10 Lambda_N [erg cm^3/s] Z=0.5 log10 Lambda_N [erg cm^3/s] Z=0.3 log10 Lambda_N [erg cm^3/s]\"\"\"" + "-----------------------------------------------------------------------------------------\\n\"\"\"" ] }, { @@ -140,7 +139,59 @@ "metadata": {}, "outputs": [], "source": [ - "np.savetxt(\"updated_schure.cooling\",schure_data.T,header=header,fmt=(\"%1.2f\",\"%2.4f\",\"%2.4f\",\"%2.4f\"))" + "for i, z in enumerate([1.0, 0.5, 0.3]):\n", + " np.savetxt(f\"schure.cooling_{z:.1f}Z\",\n", + " schure_data.T[:,[0, i + 1]],\n", + " header=header + f\"log10 T [K] Z={z:.1f} log10 Lambda_N [erg cm^3/s]\",\n", + " fmt=(\"%1.2f\",\"%2.4f\"))" + ] + }, + { + "cell_type": "markdown", + "id": "ebd552ea-937d-4d26-9517-cffaf98dbeb4", + "metadata": {}, + "source": [ + "### Process Gnat Sternberg Cooling Table" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "1a9b0fd3-a27e-46eb-b356-4d46e53bcc55", + "metadata": {}, + "outputs": [], + "source": [ + "gnat_sternberg_data = np.loadtxt(\"gnat_sternberg_cie_table.txt\", skiprows=23)" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "fdf5d5db-a0eb-43e7-9283-29339d1d6d5a", + "metadata": {}, + "outputs": [], + "source": [ + "header=\"\"\"Adapted from: http://wise-obs.tau.ac.il/~orlyg/cooling/CIEcool/tab13.txt\n", + "Title: Time-Dependent Ionization in Radiatively Cooling Gas \n", + "Authors: Orly Gnat and Amiel Sternberg\n", + "Table: CIE Cooling Efficiencies\n", + "-----------------------------------------------------------------------------------------\n", + "Our assumed Z=1 solar abundances are listed in Table 1.\n", + "-----------------------------------------------------------------------------------------\\n\"\"\"" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "0abce35b-6775-4c43-b6a8-2ed0cd6f0e1c", + "metadata": {}, + "outputs": [], + "source": [ + "for i, z in enumerate([1e-3, 1e-2, 1e-1, 1, 2]):\n", + " np.savetxt(f\"gnat-sternberg.cooling_{z:.1g}Z\",\n", + " np.log10(gnat_sternberg_data[:,[0, i + 1]]),\n", + " header=header + f\"log10 T [K] Z={z:.1g} log10 Lambda_N [erg cm^3/s]\",\n", + " fmt=(\"%1.2f\",\"%2.4f\"))" ] }, { diff --git a/docs/cooling/plot_lambda.py b/docs/cooling/plot_lambda.py index b82d6a93..1f9f6b74 100644 --- a/docs/cooling/plot_lambda.py +++ b/docs/cooling/plot_lambda.py @@ -25,7 +25,14 @@ ## Gnat and Sternberg (2007) [NOTE: n_H n_e convention for Lambda] # Columns: Temperature Lambda(Z=1e-3) Lambda(Z=1e-2) Lambda(Z=1e-1) Lambda(Z=1) Lambda(Z=2) - gs_T, gs_LambdaZem3, gs_LambdaZem2, gs_LambdaZem1, gs_LambdaZ1, gs_LambdaZ2 = ( + ( + gs_T, + gs_LambdaZem3, + gs_LambdaZem2, + gs_LambdaZem1, + gs_LambdaZ1, + gs_LambdaZ2 + ) = ( np.loadtxt("gnat_sternberg_cie_table.txt", unpack=True, skiprows=23) ) # NOTE: There is not enough information in this table alone to compute n_e! diff --git a/docs/input.md b/docs/input.md index 6d3734d4..c51aa8e7 100644 --- a/docs/input.md +++ b/docs/input.md @@ -216,15 +216,17 @@ than any other timestep constraint (e.g., the hyperbolic one). ### Cooling Tabular cooling (e.g., for optically thin cooling) is enabled through the `cooling` block in the input file. +The tabulated table itself is a text file containing (apart from comments) only two columns (two floating +point numbers per line with the first one being the log10 temperature and the second one the +log10 cooling rate scaled to a source function with $S_{cool} = n_H^2 \Lambda(T)$). + A possible block might look like: ``` -enable_cooling = tabular # To disable, set to `none` -table_filename = updated_schure.cooling # Path to the cooling table (in a text file) -log_temp_col = 0 # Column in the file that contains the log10 temperatures -log_lambda_col = 1 # Column in the file that contains the cooling rates -lambda_units_cgs = 1 # Conversion factor of the cooling rate relative to CGS units +enable_cooling = tabular # To disable, set to `none` +table_filename = schure.cooling_1.0Z # Path to the cooling table (in a text file) +lambda_units_cgs = 1 # Conversion factor of the cooling rate relative to CGS units integrator = townsend # Other possible options are `rk12` and `rk45` for error bound subcycling #max_iter = 100 # Max number of iteration for subcycling. Unsued for Townsend integrator diff --git a/inputs/cloud.in b/inputs/cloud.in index 7df63436..002febd0 100644 --- a/inputs/cloud.in +++ b/inputs/cloud.in @@ -62,9 +62,7 @@ He_mass_fraction = 0.24 enable_cooling = none # turn on with "tabular" -table_filename = updated_schure.cooling -log_temp_col = 0 -log_lambda_col = 1 +table_filename = schure.cooling_1.0Z lambda_units_cgs = 1 integrator = rk12 diff --git a/inputs/cluster/cluster.in b/inputs/cluster/cluster.in index d1355347..62d15ac1 100644 --- a/inputs/cluster/cluster.in +++ b/inputs/cluster/cluster.in @@ -86,9 +86,7 @@ code_time_cgs = 3.15576e+16 # 1 Gyr in s enable_cooling=tabular -table_filename=updated_schure.cooling -log_temp_col=0 -log_lambda_col=1 +table_filename=schure.cooling_1.0Z lambda_units_cgs=1.0 integrator=rk45 diff --git a/inputs/cluster/cooling.in b/inputs/cluster/cooling.in index a8719157..0aeb783b 100644 --- a/inputs/cluster/cooling.in +++ b/inputs/cluster/cooling.in @@ -70,9 +70,7 @@ code_time_cgs = 3.15576e+16 # 1 Gyr in s enable_cooling = tabular -table_filename = updated_schure.cooling -log_temp_col = 0 -log_lambda_col = 1 +table_filename = schure.cooling_1.0Z lambda_units_cgs = 1 #erg cm^3/s in cgs, as used in schure.cooling integrator = rk12 diff --git a/inputs/cooling_tables/gnat-sternberg.cooling b/inputs/cooling_tables/gnat-sternberg.cooling deleted file mode 100644 index bd1233a2..00000000 --- a/inputs/cooling_tables/gnat-sternberg.cooling +++ /dev/null @@ -1,208 +0,0 @@ -# Title: Time-Dependent Ionization in Radiatively Cooling Gas -# Authors: Orly Gnat and Amiel Sternberg -# Table: CIE Cooling Efficiencies -# Converted (i.e., log10) from http://wise-obs.tau.ac.il/~orlyg/cooling/CIEcool/tab13.txt -# -# cooling rates log10(Lambda) in (erg cm^3/s) for various metallicities -# logT Z=1e-3 Z=1e-2 Z=1e-1 Z=1 Z=2 -4.0000 -23.3279 -23.3028 -23.1090 -22.2526 -21.4237 -4.0199 -23.1180 -23.1085 -23.0200 -22.5100 -22.1574 -4.0402 -22.9101 -22.9031 -22.8570 -22.5436 -22.3224 -4.0603 -22.7055 -22.7033 -22.6757 -22.4672 -22.3072 -4.0803 -22.5114 -22.5100 -22.4921 -22.3458 -22.2233 -4.1004 -22.3316 -22.3307 -22.3179 -22.2104 -22.1146 -4.1206 -22.1688 -22.1675 -22.1593 -22.0762 -22.0000 -4.1408 -22.0269 -22.0264 -22.0186 -21.9547 -21.8928 -4.1608 -21.9136 -21.9136 -21.9066 -21.8508 -21.7959 -4.1810 -21.8327 -21.8327 -21.8268 -21.7773 -21.7258 -4.2011 -21.7825 -21.7825 -21.7773 -21.7305 -21.6799 -4.2212 -21.7670 -21.7670 -21.7620 -21.7122 -21.6635 -4.2413 -21.7721 -21.7721 -21.7670 -21.7167 -21.6676 -4.2613 -21.7986 -21.7986 -21.7932 -21.7399 -21.6861 -4.2815 -21.8356 -21.8327 -21.8268 -21.7696 -21.7144 -4.3015 -21.8794 -21.8794 -21.8729 -21.8097 -21.7471 -4.3216 -21.9281 -21.9281 -21.9172 -21.8447 -21.7773 -4.3416 -21.9788 -21.9788 -21.9666 -21.8827 -21.8041 -4.3617 -22.0269 -22.0259 -22.0146 -21.9172 -21.8268 -4.3818 -22.0737 -22.0726 -22.0595 -21.9431 -21.8447 -4.4021 -22.1192 -22.1175 -22.1018 -21.9666 -21.8570 -4.4221 -22.1624 -22.1605 -22.1421 -21.9872 -21.8601 -4.4422 -22.2041 -22.2013 -22.1785 -22.0000 -21.8601 -4.4622 -22.2434 -22.2403 -22.2125 -22.0066 -21.8539 -4.4824 -22.2815 -22.2782 -22.2464 -22.0101 -21.8447 -4.5026 -22.3215 -22.3170 -22.2782 -22.0101 -21.8297 -4.5226 -22.3615 -22.3565 -22.3089 -22.0052 -21.8125 -4.5427 -22.4001 -22.3936 -22.3391 -21.9957 -21.7905 -4.5628 -22.4377 -22.4306 -22.3645 -21.9830 -21.7645 -4.5830 -22.4750 -22.4660 -22.3883 -21.9666 -21.7352 -4.6030 -22.5100 -22.5003 -22.4067 -21.9431 -21.7055 -4.6231 -22.5406 -22.5287 -22.4214 -21.9172 -21.6716 -4.6433 -22.5654 -22.5513 -22.4295 -21.8894 -21.6383 -4.6633 -22.5834 -22.5670 -22.4295 -21.8601 -21.6021 -4.6834 -22.5901 -22.5719 -22.4214 -21.8268 -21.5638 -4.7035 -22.5850 -22.5654 -22.4034 -21.7905 -21.5258 -4.7236 -22.5622 -22.5421 -22.3757 -21.7520 -21.4855 -4.7437 -22.5229 -22.5017 -22.3354 -21.7122 -21.4461 -4.7638 -22.4672 -22.4473 -22.2857 -21.6716 -21.4056 -4.7839 -22.3990 -22.3799 -22.2277 -21.6289 -21.3655 -4.8040 -22.3242 -22.3072 -22.1656 -21.5867 -21.3261 -4.8241 -22.2495 -22.2343 -22.1029 -21.5452 -21.2882 -4.8442 -22.1831 -22.1688 -22.0458 -21.5058 -21.2526 -4.8643 -22.1290 -22.1152 -22.0000 -21.4724 -21.2204 -4.8844 -22.0910 -22.0778 -21.9626 -21.4425 -21.1925 -4.9045 -22.0711 -22.0580 -21.9431 -21.4202 -21.1694 -4.9246 -22.0680 -22.0535 -21.9355 -21.4012 -21.1494 -4.9447 -22.0783 -22.0635 -21.9355 -21.3872 -21.1319 -4.9648 -22.0996 -22.0830 -21.9469 -21.3768 -21.1175 -4.9849 -22.1296 -22.1113 -21.9626 -21.3686 -21.1062 -5.0052 -22.1637 -22.1433 -21.9788 -21.3645 -21.0980 -5.0253 -22.2013 -22.1791 -22.0026 -21.3645 -21.0953 -5.0453 -22.2411 -22.2168 -22.0273 -21.3696 -21.0975 -5.0652 -22.2823 -22.2557 -22.0526 -21.3768 -21.1035 -5.0853 -22.3224 -22.2941 -22.0783 -21.3862 -21.1101 -5.1055 -22.3635 -22.3316 -22.1029 -21.3947 -21.1158 -5.1255 -22.4034 -22.3686 -22.1238 -21.3990 -21.1180 -5.1458 -22.4425 -22.4045 -22.1421 -21.3990 -21.1163 -5.1658 -22.4802 -22.4389 -22.1574 -21.3958 -21.1113 -5.1858 -22.5171 -22.4711 -22.1694 -21.3893 -21.1035 -5.2060 -22.5528 -22.5017 -22.1791 -21.3820 -21.0942 -5.2261 -22.5884 -22.5317 -22.1878 -21.3747 -21.0857 -5.2463 -22.6216 -22.5607 -22.1945 -21.3675 -21.0773 -5.2662 -22.6536 -22.5867 -22.2013 -21.3615 -21.0706 -5.2865 -22.6861 -22.6126 -22.2069 -21.3556 -21.0635 -5.3066 -22.7167 -22.6364 -22.2111 -21.3497 -21.0560 -5.3265 -22.7447 -22.6596 -22.2140 -21.3429 -21.0487 -5.3467 -22.7747 -22.6819 -22.2175 -21.3372 -21.0419 -5.3668 -22.8013 -22.7033 -22.2218 -21.3335 -21.0381 -5.3869 -22.8268 -22.7235 -22.2291 -21.3354 -21.0395 -5.4071 -22.8539 -22.7471 -22.2418 -21.3449 -21.0482 -5.4272 -22.8794 -22.7696 -22.2628 -21.3635 -21.0675 -5.4472 -22.9031 -22.7959 -22.2924 -21.3947 -21.0985 -5.4673 -22.9547 -22.8447 -22.3354 -21.4353 -21.1397 -5.4874 -22.9788 -22.8729 -22.3757 -21.4802 -21.1838 -5.5076 -23.0022 -22.9031 -22.4134 -21.5229 -21.2269 -5.5276 -23.0241 -22.9245 -22.4461 -21.5591 -21.2628 -5.5478 -23.0453 -22.9469 -22.4724 -21.5867 -21.2907 -5.5678 -23.0650 -22.9666 -22.4908 -21.6055 -21.3089 -5.5879 -23.0835 -22.9872 -22.5058 -21.6180 -21.3215 -5.6081 -23.1013 -23.0009 -22.5143 -21.6234 -21.3279 -5.6282 -23.1175 -23.0146 -22.5214 -21.6271 -21.3316 -5.6483 -23.1331 -23.0273 -22.5272 -21.6308 -21.3335 -5.6684 -23.1487 -23.0395 -22.5331 -21.6326 -21.3372 -5.6884 -23.1630 -23.0521 -22.5391 -21.6383 -21.3410 -5.7085 -23.1772 -23.0645 -22.5482 -21.6459 -21.3487 -5.7287 -23.1911 -23.0783 -22.5607 -21.6576 -21.3615 -5.7487 -23.2048 -23.0937 -22.5800 -21.6778 -21.3820 -5.7689 -23.2182 -23.1096 -22.6021 -21.7033 -21.4067 -5.7889 -23.2306 -23.1255 -22.6271 -21.7305 -21.4342 -5.8090 -23.2426 -23.1415 -22.6536 -21.7620 -21.4660 -5.8292 -23.2526 -23.1549 -22.6737 -21.7852 -21.4895 -5.8492 -23.2620 -23.1669 -22.6946 -21.8097 -21.5129 -5.8693 -23.2708 -23.1765 -22.7055 -21.8210 -21.5258 -5.8895 -23.2790 -23.1844 -22.7144 -21.8327 -21.5361 -5.9096 -23.2857 -23.1918 -22.7212 -21.8356 -21.5406 -5.9296 -23.2924 -23.1972 -22.7258 -21.8416 -21.5452 -5.9497 -23.2976 -23.2020 -22.7282 -21.8416 -21.5467 -5.9698 -23.3028 -23.2062 -22.7305 -21.8447 -21.5482 -5.9899 -23.3072 -23.2111 -22.7375 -21.8508 -21.5544 -6.0000 -23.3098 -23.2132 -22.7375 -21.8508 -21.5560 -6.0199 -23.3125 -23.2168 -22.7447 -21.8601 -21.5622 -6.0398 -23.3143 -23.2204 -22.7520 -21.8665 -21.5719 -6.0599 -23.3161 -23.2240 -22.7595 -21.8761 -21.5817 -6.0799 -23.3170 -23.2262 -22.7645 -21.8861 -21.5901 -6.1000 -23.3179 -23.2284 -22.7696 -21.8928 -21.5969 -6.1199 -23.3179 -23.2306 -22.7799 -21.9031 -21.6073 -6.1399 -23.3179 -23.2321 -22.7852 -21.9101 -21.6162 -6.1599 -23.3179 -23.2328 -22.7905 -21.9208 -21.6253 -6.1801 -23.3170 -23.2343 -22.7986 -21.9318 -21.6364 -6.2000 -23.3152 -23.2358 -22.8097 -21.9469 -21.6517 -6.2201 -23.3143 -23.2381 -22.8210 -21.9626 -21.6696 -6.2400 -23.3125 -23.2403 -22.8356 -21.9830 -21.6904 -6.2601 -23.3107 -23.2426 -22.8508 -22.0088 -21.7167 -6.2801 -23.3089 -23.2441 -22.8697 -22.0348 -21.7423 -6.2999 -23.3063 -23.2464 -22.8861 -22.0635 -21.7721 -6.3199 -23.3116 -23.2549 -22.9101 -22.0942 -21.8041 -6.3400 -23.3080 -23.2557 -22.9281 -22.1232 -21.8327 -6.3600 -23.3045 -23.2565 -22.9431 -22.1518 -21.8633 -6.3800 -23.3010 -23.2557 -22.9586 -22.1798 -21.8928 -6.4000 -23.2967 -23.2549 -22.9706 -22.2069 -21.9208 -6.4200 -23.2933 -23.2541 -22.9872 -22.2351 -21.9508 -6.4400 -23.2890 -23.2526 -23.0000 -22.2612 -21.9788 -6.4600 -23.2840 -23.2510 -23.0110 -22.2882 -22.0070 -6.4800 -23.2798 -23.2487 -23.0218 -22.3143 -22.0348 -6.5000 -23.2749 -23.2464 -23.0320 -22.3391 -22.0615 -6.5200 -23.2684 -23.2418 -23.0395 -22.3625 -22.0862 -6.5400 -23.2620 -23.2373 -23.0462 -22.3840 -22.1101 -6.5600 -23.2557 -23.2321 -23.0501 -22.4023 -22.1296 -6.5800 -23.2487 -23.2269 -23.0535 -22.4191 -22.1481 -6.6000 -23.2418 -23.2211 -23.0560 -22.4330 -22.1643 -6.6200 -23.2351 -23.2154 -23.0570 -22.4461 -22.1798 -6.6400 -23.2277 -23.2090 -23.0575 -22.4584 -22.1931 -6.6600 -23.2211 -23.2034 -23.0570 -22.4685 -22.2048 -6.6800 -23.2140 -23.1965 -23.0560 -22.4789 -22.2168 -6.7000 -23.2062 -23.1904 -23.0550 -22.4868 -22.2269 -6.7200 -23.1993 -23.1838 -23.0531 -22.4962 -22.2373 -6.7400 -23.1918 -23.1772 -23.0511 -22.5031 -22.2457 -6.7600 -23.1851 -23.1707 -23.0487 -22.5100 -22.2541 -6.7800 -23.1778 -23.1637 -23.0458 -22.5143 -22.2604 -6.8000 -23.1701 -23.1568 -23.0419 -22.5186 -22.2660 -6.8200 -23.1630 -23.1500 -23.0386 -22.5214 -22.2708 -6.8400 -23.1555 -23.1433 -23.0343 -22.5243 -22.2749 -6.8600 -23.1481 -23.1361 -23.0292 -22.5243 -22.2749 -6.8800 -23.1409 -23.1290 -23.0246 -22.5258 -22.2782 -6.9000 -23.1337 -23.1221 -23.0195 -22.5258 -22.2790 -6.9200 -23.1261 -23.1146 -23.0150 -22.5272 -22.2815 -6.9400 -23.1192 -23.1079 -23.0101 -22.5287 -22.2840 -6.9600 -23.1118 -23.1007 -23.0057 -22.5302 -22.2874 -6.9800 -23.1046 -23.0937 -23.0009 -22.5317 -22.2899 -7.0000 -23.0969 -23.0867 -22.9957 -22.5346 -22.2941 -7.0199 -23.0883 -23.0783 -22.9914 -22.5391 -22.3010 -7.0398 -23.0794 -23.0696 -22.9872 -22.5436 -22.3080 -7.0599 -23.0701 -23.0615 -22.9830 -22.5498 -22.3170 -7.0799 -23.0615 -23.0531 -22.9788 -22.5607 -22.3316 -7.1000 -23.0521 -23.0443 -22.9747 -22.5702 -22.3449 -7.1199 -23.0434 -23.0357 -22.9706 -22.5817 -22.3605 -7.1399 -23.0357 -23.0292 -22.9666 -22.5952 -22.3788 -7.1599 -23.0273 -23.0209 -22.9626 -22.6091 -22.3979 -7.1801 -23.0182 -23.0123 -22.9586 -22.6253 -22.4191 -7.2000 -23.0088 -23.0039 -22.9547 -22.6383 -22.4389 -7.2201 -23.0004 -22.9957 -22.9508 -22.6536 -22.4597 -7.2400 -22.9914 -22.9872 -22.9469 -22.6676 -22.4815 -7.2601 -22.9830 -22.9788 -22.9431 -22.6799 -22.5003 -7.2801 -22.9747 -22.9706 -22.9355 -22.6904 -22.5186 -7.2999 -22.9666 -22.9626 -22.9318 -22.6990 -22.5346 -7.3199 -22.9547 -22.9547 -22.9245 -22.7077 -22.5482 -7.3400 -22.9469 -22.9431 -22.9172 -22.7144 -22.5607 -7.3600 -22.9393 -22.9355 -22.9136 -22.7190 -22.5702 -7.3800 -22.9318 -22.9281 -22.9066 -22.7212 -22.5784 -7.4000 -22.9208 -22.9208 -22.8996 -22.7235 -22.5850 -7.4200 -22.9136 -22.9101 -22.8928 -22.7235 -22.5901 -7.4400 -22.9066 -22.9031 -22.8827 -22.7235 -22.5935 -7.4600 -22.8962 -22.8962 -22.8761 -22.7212 -22.5952 -7.4800 -22.8894 -22.8861 -22.8697 -22.7190 -22.5969 -7.5000 -22.8827 -22.8794 -22.8633 -22.7167 -22.5952 -7.5200 -22.8729 -22.8697 -22.8539 -22.7122 -22.5918 -7.5400 -22.8633 -22.8601 -22.8447 -22.7055 -22.5884 -7.5600 -22.8539 -22.8508 -22.8356 -22.6990 -22.5850 -7.5800 -22.8447 -22.8416 -22.8268 -22.6925 -22.5800 -7.6000 -22.8356 -22.8327 -22.8182 -22.6861 -22.5735 -7.6200 -22.8268 -22.8239 -22.8097 -22.6799 -22.5686 -7.6400 -22.8182 -22.8182 -22.8013 -22.6737 -22.5622 -7.6600 -22.8097 -22.8097 -22.7932 -22.6655 -22.5544 -7.6800 -22.8013 -22.8013 -22.7852 -22.6576 -22.5482 -7.7000 -22.7932 -22.7932 -22.7773 -22.6498 -22.5406 -7.7200 -22.7852 -22.7852 -22.7696 -22.6440 -22.5361 -7.7400 -22.7799 -22.7773 -22.7620 -22.6364 -22.5287 -7.7600 -22.7721 -22.7696 -22.7570 -22.6308 -22.5229 -7.7800 -22.7645 -22.7645 -22.7496 -22.6234 -22.5157 -7.8000 -22.7595 -22.7570 -22.7423 -22.6180 -22.5114 -7.8200 -22.7520 -22.7496 -22.7375 -22.6126 -22.5058 -7.8400 -22.7471 -22.7447 -22.7305 -22.6073 -22.5017 -7.8600 -22.7399 -22.7399 -22.7258 -22.6021 -22.4962 -7.8800 -22.7352 -22.7328 -22.7190 -22.5986 -22.4935 -7.9000 -22.7305 -22.7282 -22.7144 -22.5935 -22.4895 -7.9200 -22.7258 -22.7235 -22.7100 -22.5918 -22.4881 -7.9400 -22.7190 -22.7190 -22.7055 -22.5884 -22.4868 -7.9600 -22.7167 -22.7144 -22.7011 -22.5867 -22.4855 -7.9800 -22.7122 -22.7100 -22.6990 -22.5850 -22.4868 -8.0000 -22.7077 -22.7077 -22.6946 -22.5834 -22.4855 diff --git a/inputs/cooling_tables/gnat-sternberg.cooling_0.001Z b/inputs/cooling_tables/gnat-sternberg.cooling_0.001Z new file mode 100644 index 00000000..13fb61d1 --- /dev/null +++ b/inputs/cooling_tables/gnat-sternberg.cooling_0.001Z @@ -0,0 +1,209 @@ +# Adapted from: http://wise-obs.tau.ac.il/~orlyg/cooling/CIEcool/tab13.txt +# Title: Time-Dependent Ionization in Radiatively Cooling Gas +# Authors: Orly Gnat and Amiel Sternberg +# Table: CIE Cooling Efficiencies +# ----------------------------------------------------------------------------------------- +# Our assumed Z=1 solar abundances are listed in Table 1. +# ----------------------------------------------------------------------------------------- +# log10 T [K] Z=0.001 log10 Lambda_N [erg cm^3/s] +4.00 -23.3279 +4.02 -23.1180 +4.04 -22.9101 +4.06 -22.7055 +4.08 -22.5114 +4.10 -22.3316 +4.12 -22.1688 +4.14 -22.0269 +4.16 -21.9136 +4.18 -21.8327 +4.20 -21.7825 +4.22 -21.7670 +4.24 -21.7721 +4.26 -21.7986 +4.28 -21.8356 +4.30 -21.8794 +4.32 -21.9281 +4.34 -21.9788 +4.36 -22.0269 +4.38 -22.0737 +4.40 -22.1192 +4.42 -22.1624 +4.44 -22.2041 +4.46 -22.2434 +4.48 -22.2815 +4.50 -22.3215 +4.52 -22.3615 +4.54 -22.4001 +4.56 -22.4377 +4.58 -22.4750 +4.60 -22.5100 +4.62 -22.5406 +4.64 -22.5654 +4.66 -22.5834 +4.68 -22.5901 +4.70 -22.5850 +4.72 -22.5622 +4.74 -22.5229 +4.76 -22.4672 +4.78 -22.3990 +4.80 -22.3242 +4.82 -22.2495 +4.84 -22.1831 +4.86 -22.1290 +4.88 -22.0910 +4.90 -22.0711 +4.92 -22.0680 +4.94 -22.0783 +4.96 -22.0996 +4.98 -22.1296 +5.01 -22.1637 +5.03 -22.2013 +5.05 -22.2411 +5.07 -22.2823 +5.09 -22.3224 +5.11 -22.3635 +5.13 -22.4034 +5.15 -22.4425 +5.17 -22.4802 +5.19 -22.5171 +5.21 -22.5528 +5.23 -22.5884 +5.25 -22.6216 +5.27 -22.6536 +5.29 -22.6861 +5.31 -22.7167 +5.33 -22.7447 +5.35 -22.7747 +5.37 -22.8013 +5.39 -22.8268 +5.41 -22.8539 +5.43 -22.8794 +5.45 -22.9031 +5.47 -22.9547 +5.49 -22.9788 +5.51 -23.0022 +5.53 -23.0241 +5.55 -23.0453 +5.57 -23.0650 +5.59 -23.0835 +5.61 -23.1013 +5.63 -23.1175 +5.65 -23.1331 +5.67 -23.1487 +5.69 -23.1630 +5.71 -23.1772 +5.73 -23.1911 +5.75 -23.2048 +5.77 -23.2182 +5.79 -23.2306 +5.81 -23.2426 +5.83 -23.2526 +5.85 -23.2620 +5.87 -23.2708 +5.89 -23.2790 +5.91 -23.2857 +5.93 -23.2924 +5.95 -23.2976 +5.97 -23.3028 +5.99 -23.3072 +6.00 -23.3098 +6.02 -23.3125 +6.04 -23.3143 +6.06 -23.3161 +6.08 -23.3170 +6.10 -23.3179 +6.12 -23.3179 +6.14 -23.3179 +6.16 -23.3179 +6.18 -23.3170 +6.20 -23.3152 +6.22 -23.3143 +6.24 -23.3125 +6.26 -23.3107 +6.28 -23.3089 +6.30 -23.3063 +6.32 -23.3116 +6.34 -23.3080 +6.36 -23.3045 +6.38 -23.3010 +6.40 -23.2967 +6.42 -23.2933 +6.44 -23.2890 +6.46 -23.2840 +6.48 -23.2798 +6.50 -23.2749 +6.52 -23.2684 +6.54 -23.2620 +6.56 -23.2557 +6.58 -23.2487 +6.60 -23.2418 +6.62 -23.2351 +6.64 -23.2277 +6.66 -23.2211 +6.68 -23.2140 +6.70 -23.2062 +6.72 -23.1993 +6.74 -23.1918 +6.76 -23.1851 +6.78 -23.1778 +6.80 -23.1701 +6.82 -23.1630 +6.84 -23.1555 +6.86 -23.1481 +6.88 -23.1409 +6.90 -23.1337 +6.92 -23.1261 +6.94 -23.1192 +6.96 -23.1118 +6.98 -23.1046 +7.00 -23.0969 +7.02 -23.0883 +7.04 -23.0794 +7.06 -23.0701 +7.08 -23.0615 +7.10 -23.0521 +7.12 -23.0434 +7.14 -23.0357 +7.16 -23.0273 +7.18 -23.0182 +7.20 -23.0088 +7.22 -23.0004 +7.24 -22.9914 +7.26 -22.9830 +7.28 -22.9747 +7.30 -22.9666 +7.32 -22.9547 +7.34 -22.9469 +7.36 -22.9393 +7.38 -22.9318 +7.40 -22.9208 +7.42 -22.9136 +7.44 -22.9066 +7.46 -22.8962 +7.48 -22.8894 +7.50 -22.8827 +7.52 -22.8729 +7.54 -22.8633 +7.56 -22.8539 +7.58 -22.8447 +7.60 -22.8356 +7.62 -22.8268 +7.64 -22.8182 +7.66 -22.8097 +7.68 -22.8013 +7.70 -22.7932 +7.72 -22.7852 +7.74 -22.7799 +7.76 -22.7721 +7.78 -22.7645 +7.80 -22.7595 +7.82 -22.7520 +7.84 -22.7471 +7.86 -22.7399 +7.88 -22.7352 +7.90 -22.7305 +7.92 -22.7258 +7.94 -22.7190 +7.96 -22.7167 +7.98 -22.7122 +8.00 -22.7077 diff --git a/inputs/cooling_tables/gnat-sternberg.cooling_0.01Z b/inputs/cooling_tables/gnat-sternberg.cooling_0.01Z new file mode 100644 index 00000000..ca4cf0c4 --- /dev/null +++ b/inputs/cooling_tables/gnat-sternberg.cooling_0.01Z @@ -0,0 +1,209 @@ +# Adapted from: http://wise-obs.tau.ac.il/~orlyg/cooling/CIEcool/tab13.txt +# Title: Time-Dependent Ionization in Radiatively Cooling Gas +# Authors: Orly Gnat and Amiel Sternberg +# Table: CIE Cooling Efficiencies +# ----------------------------------------------------------------------------------------- +# Our assumed Z=1 solar abundances are listed in Table 1. +# ----------------------------------------------------------------------------------------- +# log10 T [K] Z=0.01 log10 Lambda_N [erg cm^3/s] +4.00 -23.3028 +4.02 -23.1085 +4.04 -22.9031 +4.06 -22.7033 +4.08 -22.5100 +4.10 -22.3307 +4.12 -22.1675 +4.14 -22.0264 +4.16 -21.9136 +4.18 -21.8327 +4.20 -21.7825 +4.22 -21.7670 +4.24 -21.7721 +4.26 -21.7986 +4.28 -21.8327 +4.30 -21.8794 +4.32 -21.9281 +4.34 -21.9788 +4.36 -22.0259 +4.38 -22.0726 +4.40 -22.1175 +4.42 -22.1605 +4.44 -22.2013 +4.46 -22.2403 +4.48 -22.2782 +4.50 -22.3170 +4.52 -22.3565 +4.54 -22.3936 +4.56 -22.4306 +4.58 -22.4660 +4.60 -22.5003 +4.62 -22.5287 +4.64 -22.5513 +4.66 -22.5670 +4.68 -22.5719 +4.70 -22.5654 +4.72 -22.5421 +4.74 -22.5017 +4.76 -22.4473 +4.78 -22.3799 +4.80 -22.3072 +4.82 -22.2343 +4.84 -22.1688 +4.86 -22.1152 +4.88 -22.0778 +4.90 -22.0580 +4.92 -22.0535 +4.94 -22.0635 +4.96 -22.0830 +4.98 -22.1113 +5.01 -22.1433 +5.03 -22.1791 +5.05 -22.2168 +5.07 -22.2557 +5.09 -22.2941 +5.11 -22.3316 +5.13 -22.3686 +5.15 -22.4045 +5.17 -22.4389 +5.19 -22.4711 +5.21 -22.5017 +5.23 -22.5317 +5.25 -22.5607 +5.27 -22.5867 +5.29 -22.6126 +5.31 -22.6364 +5.33 -22.6596 +5.35 -22.6819 +5.37 -22.7033 +5.39 -22.7235 +5.41 -22.7471 +5.43 -22.7696 +5.45 -22.7959 +5.47 -22.8447 +5.49 -22.8729 +5.51 -22.9031 +5.53 -22.9245 +5.55 -22.9469 +5.57 -22.9666 +5.59 -22.9872 +5.61 -23.0009 +5.63 -23.0146 +5.65 -23.0273 +5.67 -23.0395 +5.69 -23.0521 +5.71 -23.0645 +5.73 -23.0783 +5.75 -23.0937 +5.77 -23.1096 +5.79 -23.1255 +5.81 -23.1415 +5.83 -23.1549 +5.85 -23.1669 +5.87 -23.1765 +5.89 -23.1844 +5.91 -23.1918 +5.93 -23.1972 +5.95 -23.2020 +5.97 -23.2062 +5.99 -23.2111 +6.00 -23.2132 +6.02 -23.2168 +6.04 -23.2204 +6.06 -23.2240 +6.08 -23.2262 +6.10 -23.2284 +6.12 -23.2306 +6.14 -23.2321 +6.16 -23.2328 +6.18 -23.2343 +6.20 -23.2358 +6.22 -23.2381 +6.24 -23.2403 +6.26 -23.2426 +6.28 -23.2441 +6.30 -23.2464 +6.32 -23.2549 +6.34 -23.2557 +6.36 -23.2565 +6.38 -23.2557 +6.40 -23.2549 +6.42 -23.2541 +6.44 -23.2526 +6.46 -23.2510 +6.48 -23.2487 +6.50 -23.2464 +6.52 -23.2418 +6.54 -23.2373 +6.56 -23.2321 +6.58 -23.2269 +6.60 -23.2211 +6.62 -23.2154 +6.64 -23.2090 +6.66 -23.2034 +6.68 -23.1965 +6.70 -23.1904 +6.72 -23.1838 +6.74 -23.1772 +6.76 -23.1707 +6.78 -23.1637 +6.80 -23.1568 +6.82 -23.1500 +6.84 -23.1433 +6.86 -23.1361 +6.88 -23.1290 +6.90 -23.1221 +6.92 -23.1146 +6.94 -23.1079 +6.96 -23.1007 +6.98 -23.0937 +7.00 -23.0867 +7.02 -23.0783 +7.04 -23.0696 +7.06 -23.0615 +7.08 -23.0531 +7.10 -23.0443 +7.12 -23.0357 +7.14 -23.0292 +7.16 -23.0209 +7.18 -23.0123 +7.20 -23.0039 +7.22 -22.9957 +7.24 -22.9872 +7.26 -22.9788 +7.28 -22.9706 +7.30 -22.9626 +7.32 -22.9547 +7.34 -22.9431 +7.36 -22.9355 +7.38 -22.9281 +7.40 -22.9208 +7.42 -22.9101 +7.44 -22.9031 +7.46 -22.8962 +7.48 -22.8861 +7.50 -22.8794 +7.52 -22.8697 +7.54 -22.8601 +7.56 -22.8508 +7.58 -22.8416 +7.60 -22.8327 +7.62 -22.8239 +7.64 -22.8182 +7.66 -22.8097 +7.68 -22.8013 +7.70 -22.7932 +7.72 -22.7852 +7.74 -22.7773 +7.76 -22.7696 +7.78 -22.7645 +7.80 -22.7570 +7.82 -22.7496 +7.84 -22.7447 +7.86 -22.7399 +7.88 -22.7328 +7.90 -22.7282 +7.92 -22.7235 +7.94 -22.7190 +7.96 -22.7144 +7.98 -22.7100 +8.00 -22.7077 diff --git a/inputs/cooling_tables/gnat-sternberg.cooling_0.1Z b/inputs/cooling_tables/gnat-sternberg.cooling_0.1Z new file mode 100644 index 00000000..53f1ceb3 --- /dev/null +++ b/inputs/cooling_tables/gnat-sternberg.cooling_0.1Z @@ -0,0 +1,209 @@ +# Adapted from: http://wise-obs.tau.ac.il/~orlyg/cooling/CIEcool/tab13.txt +# Title: Time-Dependent Ionization in Radiatively Cooling Gas +# Authors: Orly Gnat and Amiel Sternberg +# Table: CIE Cooling Efficiencies +# ----------------------------------------------------------------------------------------- +# Our assumed Z=1 solar abundances are listed in Table 1. +# ----------------------------------------------------------------------------------------- +# log10 T [K] Z=0.1 log10 Lambda_N [erg cm^3/s] +4.00 -23.1090 +4.02 -23.0200 +4.04 -22.8570 +4.06 -22.6757 +4.08 -22.4921 +4.10 -22.3179 +4.12 -22.1593 +4.14 -22.0186 +4.16 -21.9066 +4.18 -21.8268 +4.20 -21.7773 +4.22 -21.7620 +4.24 -21.7670 +4.26 -21.7932 +4.28 -21.8268 +4.30 -21.8729 +4.32 -21.9172 +4.34 -21.9666 +4.36 -22.0146 +4.38 -22.0595 +4.40 -22.1018 +4.42 -22.1421 +4.44 -22.1785 +4.46 -22.2125 +4.48 -22.2464 +4.50 -22.2782 +4.52 -22.3089 +4.54 -22.3391 +4.56 -22.3645 +4.58 -22.3883 +4.60 -22.4067 +4.62 -22.4214 +4.64 -22.4295 +4.66 -22.4295 +4.68 -22.4214 +4.70 -22.4034 +4.72 -22.3757 +4.74 -22.3354 +4.76 -22.2857 +4.78 -22.2277 +4.80 -22.1656 +4.82 -22.1029 +4.84 -22.0458 +4.86 -22.0000 +4.88 -21.9626 +4.90 -21.9431 +4.92 -21.9355 +4.94 -21.9355 +4.96 -21.9469 +4.98 -21.9626 +5.01 -21.9788 +5.03 -22.0026 +5.05 -22.0273 +5.07 -22.0526 +5.09 -22.0783 +5.11 -22.1029 +5.13 -22.1238 +5.15 -22.1421 +5.17 -22.1574 +5.19 -22.1694 +5.21 -22.1791 +5.23 -22.1878 +5.25 -22.1945 +5.27 -22.2013 +5.29 -22.2069 +5.31 -22.2111 +5.33 -22.2140 +5.35 -22.2175 +5.37 -22.2218 +5.39 -22.2291 +5.41 -22.2418 +5.43 -22.2628 +5.45 -22.2924 +5.47 -22.3354 +5.49 -22.3757 +5.51 -22.4134 +5.53 -22.4461 +5.55 -22.4724 +5.57 -22.4908 +5.59 -22.5058 +5.61 -22.5143 +5.63 -22.5214 +5.65 -22.5272 +5.67 -22.5331 +5.69 -22.5391 +5.71 -22.5482 +5.73 -22.5607 +5.75 -22.5800 +5.77 -22.6021 +5.79 -22.6271 +5.81 -22.6536 +5.83 -22.6737 +5.85 -22.6946 +5.87 -22.7055 +5.89 -22.7144 +5.91 -22.7212 +5.93 -22.7258 +5.95 -22.7282 +5.97 -22.7305 +5.99 -22.7375 +6.00 -22.7375 +6.02 -22.7447 +6.04 -22.7520 +6.06 -22.7595 +6.08 -22.7645 +6.10 -22.7696 +6.12 -22.7799 +6.14 -22.7852 +6.16 -22.7905 +6.18 -22.7986 +6.20 -22.8097 +6.22 -22.8210 +6.24 -22.8356 +6.26 -22.8508 +6.28 -22.8697 +6.30 -22.8861 +6.32 -22.9101 +6.34 -22.9281 +6.36 -22.9431 +6.38 -22.9586 +6.40 -22.9706 +6.42 -22.9872 +6.44 -23.0000 +6.46 -23.0110 +6.48 -23.0218 +6.50 -23.0320 +6.52 -23.0395 +6.54 -23.0462 +6.56 -23.0501 +6.58 -23.0535 +6.60 -23.0560 +6.62 -23.0570 +6.64 -23.0575 +6.66 -23.0570 +6.68 -23.0560 +6.70 -23.0550 +6.72 -23.0531 +6.74 -23.0511 +6.76 -23.0487 +6.78 -23.0458 +6.80 -23.0419 +6.82 -23.0386 +6.84 -23.0343 +6.86 -23.0292 +6.88 -23.0246 +6.90 -23.0195 +6.92 -23.0150 +6.94 -23.0101 +6.96 -23.0057 +6.98 -23.0009 +7.00 -22.9957 +7.02 -22.9914 +7.04 -22.9872 +7.06 -22.9830 +7.08 -22.9788 +7.10 -22.9747 +7.12 -22.9706 +7.14 -22.9666 +7.16 -22.9626 +7.18 -22.9586 +7.20 -22.9547 +7.22 -22.9508 +7.24 -22.9469 +7.26 -22.9431 +7.28 -22.9355 +7.30 -22.9318 +7.32 -22.9245 +7.34 -22.9172 +7.36 -22.9136 +7.38 -22.9066 +7.40 -22.8996 +7.42 -22.8928 +7.44 -22.8827 +7.46 -22.8761 +7.48 -22.8697 +7.50 -22.8633 +7.52 -22.8539 +7.54 -22.8447 +7.56 -22.8356 +7.58 -22.8268 +7.60 -22.8182 +7.62 -22.8097 +7.64 -22.8013 +7.66 -22.7932 +7.68 -22.7852 +7.70 -22.7773 +7.72 -22.7696 +7.74 -22.7620 +7.76 -22.7570 +7.78 -22.7496 +7.80 -22.7423 +7.82 -22.7375 +7.84 -22.7305 +7.86 -22.7258 +7.88 -22.7190 +7.90 -22.7144 +7.92 -22.7100 +7.94 -22.7055 +7.96 -22.7011 +7.98 -22.6990 +8.00 -22.6946 diff --git a/inputs/cooling_tables/gnat-sternberg.cooling_1Z b/inputs/cooling_tables/gnat-sternberg.cooling_1Z new file mode 100644 index 00000000..9fdcaf94 --- /dev/null +++ b/inputs/cooling_tables/gnat-sternberg.cooling_1Z @@ -0,0 +1,209 @@ +# Adapted from: http://wise-obs.tau.ac.il/~orlyg/cooling/CIEcool/tab13.txt +# Title: Time-Dependent Ionization in Radiatively Cooling Gas +# Authors: Orly Gnat and Amiel Sternberg +# Table: CIE Cooling Efficiencies +# ----------------------------------------------------------------------------------------- +# Our assumed Z=1 solar abundances are listed in Table 1. +# ----------------------------------------------------------------------------------------- +# log10 T [K] Z=1 log10 Lambda_N [erg cm^3/s] +4.00 -22.2526 +4.02 -22.5100 +4.04 -22.5436 +4.06 -22.4672 +4.08 -22.3458 +4.10 -22.2104 +4.12 -22.0762 +4.14 -21.9547 +4.16 -21.8508 +4.18 -21.7773 +4.20 -21.7305 +4.22 -21.7122 +4.24 -21.7167 +4.26 -21.7399 +4.28 -21.7696 +4.30 -21.8097 +4.32 -21.8447 +4.34 -21.8827 +4.36 -21.9172 +4.38 -21.9431 +4.40 -21.9666 +4.42 -21.9872 +4.44 -22.0000 +4.46 -22.0066 +4.48 -22.0101 +4.50 -22.0101 +4.52 -22.0052 +4.54 -21.9957 +4.56 -21.9830 +4.58 -21.9666 +4.60 -21.9431 +4.62 -21.9172 +4.64 -21.8894 +4.66 -21.8601 +4.68 -21.8268 +4.70 -21.7905 +4.72 -21.7520 +4.74 -21.7122 +4.76 -21.6716 +4.78 -21.6289 +4.80 -21.5867 +4.82 -21.5452 +4.84 -21.5058 +4.86 -21.4724 +4.88 -21.4425 +4.90 -21.4202 +4.92 -21.4012 +4.94 -21.3872 +4.96 -21.3768 +4.98 -21.3686 +5.01 -21.3645 +5.03 -21.3645 +5.05 -21.3696 +5.07 -21.3768 +5.09 -21.3862 +5.11 -21.3947 +5.13 -21.3990 +5.15 -21.3990 +5.17 -21.3958 +5.19 -21.3893 +5.21 -21.3820 +5.23 -21.3747 +5.25 -21.3675 +5.27 -21.3615 +5.29 -21.3556 +5.31 -21.3497 +5.33 -21.3429 +5.35 -21.3372 +5.37 -21.3335 +5.39 -21.3354 +5.41 -21.3449 +5.43 -21.3635 +5.45 -21.3947 +5.47 -21.4353 +5.49 -21.4802 +5.51 -21.5229 +5.53 -21.5591 +5.55 -21.5867 +5.57 -21.6055 +5.59 -21.6180 +5.61 -21.6234 +5.63 -21.6271 +5.65 -21.6308 +5.67 -21.6326 +5.69 -21.6383 +5.71 -21.6459 +5.73 -21.6576 +5.75 -21.6778 +5.77 -21.7033 +5.79 -21.7305 +5.81 -21.7620 +5.83 -21.7852 +5.85 -21.8097 +5.87 -21.8210 +5.89 -21.8327 +5.91 -21.8356 +5.93 -21.8416 +5.95 -21.8416 +5.97 -21.8447 +5.99 -21.8508 +6.00 -21.8508 +6.02 -21.8601 +6.04 -21.8665 +6.06 -21.8761 +6.08 -21.8861 +6.10 -21.8928 +6.12 -21.9031 +6.14 -21.9101 +6.16 -21.9208 +6.18 -21.9318 +6.20 -21.9469 +6.22 -21.9626 +6.24 -21.9830 +6.26 -22.0088 +6.28 -22.0348 +6.30 -22.0635 +6.32 -22.0942 +6.34 -22.1232 +6.36 -22.1518 +6.38 -22.1798 +6.40 -22.2069 +6.42 -22.2351 +6.44 -22.2612 +6.46 -22.2882 +6.48 -22.3143 +6.50 -22.3391 +6.52 -22.3625 +6.54 -22.3840 +6.56 -22.4023 +6.58 -22.4191 +6.60 -22.4330 +6.62 -22.4461 +6.64 -22.4584 +6.66 -22.4685 +6.68 -22.4789 +6.70 -22.4868 +6.72 -22.4962 +6.74 -22.5031 +6.76 -22.5100 +6.78 -22.5143 +6.80 -22.5186 +6.82 -22.5214 +6.84 -22.5243 +6.86 -22.5243 +6.88 -22.5258 +6.90 -22.5258 +6.92 -22.5272 +6.94 -22.5287 +6.96 -22.5302 +6.98 -22.5317 +7.00 -22.5346 +7.02 -22.5391 +7.04 -22.5436 +7.06 -22.5498 +7.08 -22.5607 +7.10 -22.5702 +7.12 -22.5817 +7.14 -22.5952 +7.16 -22.6091 +7.18 -22.6253 +7.20 -22.6383 +7.22 -22.6536 +7.24 -22.6676 +7.26 -22.6799 +7.28 -22.6904 +7.30 -22.6990 +7.32 -22.7077 +7.34 -22.7144 +7.36 -22.7190 +7.38 -22.7212 +7.40 -22.7235 +7.42 -22.7235 +7.44 -22.7235 +7.46 -22.7212 +7.48 -22.7190 +7.50 -22.7167 +7.52 -22.7122 +7.54 -22.7055 +7.56 -22.6990 +7.58 -22.6925 +7.60 -22.6861 +7.62 -22.6799 +7.64 -22.6737 +7.66 -22.6655 +7.68 -22.6576 +7.70 -22.6498 +7.72 -22.6440 +7.74 -22.6364 +7.76 -22.6308 +7.78 -22.6234 +7.80 -22.6180 +7.82 -22.6126 +7.84 -22.6073 +7.86 -22.6021 +7.88 -22.5986 +7.90 -22.5935 +7.92 -22.5918 +7.94 -22.5884 +7.96 -22.5867 +7.98 -22.5850 +8.00 -22.5834 diff --git a/inputs/cooling_tables/gnat-sternberg.cooling_2Z b/inputs/cooling_tables/gnat-sternberg.cooling_2Z new file mode 100644 index 00000000..87995a09 --- /dev/null +++ b/inputs/cooling_tables/gnat-sternberg.cooling_2Z @@ -0,0 +1,209 @@ +# Adapted from: http://wise-obs.tau.ac.il/~orlyg/cooling/CIEcool/tab13.txt +# Title: Time-Dependent Ionization in Radiatively Cooling Gas +# Authors: Orly Gnat and Amiel Sternberg +# Table: CIE Cooling Efficiencies +# ----------------------------------------------------------------------------------------- +# Our assumed Z=1 solar abundances are listed in Table 1. +# ----------------------------------------------------------------------------------------- +# log10 T [K] Z=2 log10 Lambda_N [erg cm^3/s] +4.00 -21.4237 +4.02 -22.1574 +4.04 -22.3224 +4.06 -22.3072 +4.08 -22.2233 +4.10 -22.1146 +4.12 -22.0000 +4.14 -21.8928 +4.16 -21.7959 +4.18 -21.7258 +4.20 -21.6799 +4.22 -21.6635 +4.24 -21.6676 +4.26 -21.6861 +4.28 -21.7144 +4.30 -21.7471 +4.32 -21.7773 +4.34 -21.8041 +4.36 -21.8268 +4.38 -21.8447 +4.40 -21.8570 +4.42 -21.8601 +4.44 -21.8601 +4.46 -21.8539 +4.48 -21.8447 +4.50 -21.8297 +4.52 -21.8125 +4.54 -21.7905 +4.56 -21.7645 +4.58 -21.7352 +4.60 -21.7055 +4.62 -21.6716 +4.64 -21.6383 +4.66 -21.6021 +4.68 -21.5638 +4.70 -21.5258 +4.72 -21.4855 +4.74 -21.4461 +4.76 -21.4056 +4.78 -21.3655 +4.80 -21.3261 +4.82 -21.2882 +4.84 -21.2526 +4.86 -21.2204 +4.88 -21.1925 +4.90 -21.1694 +4.92 -21.1494 +4.94 -21.1319 +4.96 -21.1175 +4.98 -21.1062 +5.01 -21.0980 +5.03 -21.0953 +5.05 -21.0975 +5.07 -21.1035 +5.09 -21.1101 +5.11 -21.1158 +5.13 -21.1180 +5.15 -21.1163 +5.17 -21.1113 +5.19 -21.1035 +5.21 -21.0942 +5.23 -21.0857 +5.25 -21.0773 +5.27 -21.0706 +5.29 -21.0635 +5.31 -21.0560 +5.33 -21.0487 +5.35 -21.0419 +5.37 -21.0381 +5.39 -21.0395 +5.41 -21.0482 +5.43 -21.0675 +5.45 -21.0985 +5.47 -21.1397 +5.49 -21.1838 +5.51 -21.2269 +5.53 -21.2628 +5.55 -21.2907 +5.57 -21.3089 +5.59 -21.3215 +5.61 -21.3279 +5.63 -21.3316 +5.65 -21.3335 +5.67 -21.3372 +5.69 -21.3410 +5.71 -21.3487 +5.73 -21.3615 +5.75 -21.3820 +5.77 -21.4067 +5.79 -21.4342 +5.81 -21.4660 +5.83 -21.4895 +5.85 -21.5129 +5.87 -21.5258 +5.89 -21.5361 +5.91 -21.5406 +5.93 -21.5452 +5.95 -21.5467 +5.97 -21.5482 +5.99 -21.5544 +6.00 -21.5560 +6.02 -21.5622 +6.04 -21.5719 +6.06 -21.5817 +6.08 -21.5901 +6.10 -21.5969 +6.12 -21.6073 +6.14 -21.6162 +6.16 -21.6253 +6.18 -21.6364 +6.20 -21.6517 +6.22 -21.6696 +6.24 -21.6904 +6.26 -21.7167 +6.28 -21.7423 +6.30 -21.7721 +6.32 -21.8041 +6.34 -21.8327 +6.36 -21.8633 +6.38 -21.8928 +6.40 -21.9208 +6.42 -21.9508 +6.44 -21.9788 +6.46 -22.0070 +6.48 -22.0348 +6.50 -22.0615 +6.52 -22.0862 +6.54 -22.1101 +6.56 -22.1296 +6.58 -22.1481 +6.60 -22.1643 +6.62 -22.1798 +6.64 -22.1931 +6.66 -22.2048 +6.68 -22.2168 +6.70 -22.2269 +6.72 -22.2373 +6.74 -22.2457 +6.76 -22.2541 +6.78 -22.2604 +6.80 -22.2660 +6.82 -22.2708 +6.84 -22.2749 +6.86 -22.2749 +6.88 -22.2782 +6.90 -22.2790 +6.92 -22.2815 +6.94 -22.2840 +6.96 -22.2874 +6.98 -22.2899 +7.00 -22.2941 +7.02 -22.3010 +7.04 -22.3080 +7.06 -22.3170 +7.08 -22.3316 +7.10 -22.3449 +7.12 -22.3605 +7.14 -22.3788 +7.16 -22.3979 +7.18 -22.4191 +7.20 -22.4389 +7.22 -22.4597 +7.24 -22.4815 +7.26 -22.5003 +7.28 -22.5186 +7.30 -22.5346 +7.32 -22.5482 +7.34 -22.5607 +7.36 -22.5702 +7.38 -22.5784 +7.40 -22.5850 +7.42 -22.5901 +7.44 -22.5935 +7.46 -22.5952 +7.48 -22.5969 +7.50 -22.5952 +7.52 -22.5918 +7.54 -22.5884 +7.56 -22.5850 +7.58 -22.5800 +7.60 -22.5735 +7.62 -22.5686 +7.64 -22.5622 +7.66 -22.5544 +7.68 -22.5482 +7.70 -22.5406 +7.72 -22.5361 +7.74 -22.5287 +7.76 -22.5229 +7.78 -22.5157 +7.80 -22.5114 +7.82 -22.5058 +7.84 -22.5017 +7.86 -22.4962 +7.88 -22.4935 +7.90 -22.4895 +7.92 -22.4881 +7.94 -22.4868 +7.96 -22.4855 +7.98 -22.4868 +8.00 -22.4855 diff --git a/inputs/cooling_tables/schure.cooling_0.3Z b/inputs/cooling_tables/schure.cooling_0.3Z new file mode 100644 index 00000000..a3e8cfc6 --- /dev/null +++ b/inputs/cooling_tables/schure.cooling_0.3Z @@ -0,0 +1,111 @@ +# Cooling rates generated from Schure 2009 (doi.org/10.1051/0004-6361/200912495) +# containing temperatures in the first column (in log10 K) and collisional ionisation +# equilibrium (CIE) cooling rates (in log10 erg cm^3/s). +# Cooling rates are in the convention Lambda_hd from eq. 1, +# where the proton ratio n_e/n_H is taken from table 2. +# Lambda_N is computed from eq. 3. The cooling rate Lambda_N(X_i,T) from eq. 3 is contained +# in table 4. n_i/n_i(solar) is taken to be 1.0 for all elements for Z=1 while for Z=0.5 +# and Z=0.3 n_i/n_i(solar) is set to 1 for H and He and set to 0.5 and 0.3 respectively for +# all other elements. Made by Forrest Glines (forrestglines@gmail.com) +# ----------------------------------------------------------------------------------------- +# log10 T [K] Z=0.3 log10 Lambda_N [erg cm^3/s] +4.20 -21.6114 +4.24 -21.4833 +4.28 -21.5129 +4.32 -21.5974 +4.36 -21.6878 +4.40 -21.7659 +4.44 -21.8092 +4.48 -21.8230 +4.52 -21.8059 +4.56 -21.7621 +4.60 -21.6941 +4.64 -21.6111 +4.68 -21.5286 +4.72 -21.4387 +4.76 -21.3589 +4.80 -21.2816 +4.84 -21.2168 +4.88 -21.1700 +4.92 -21.1423 +4.96 -21.1331 +5.00 -21.1525 +5.04 -21.1820 +5.08 -21.2077 +5.12 -21.2093 +5.16 -21.2043 +5.20 -21.1937 +5.24 -21.1832 +5.28 -21.1811 +5.32 -21.1799 +5.36 -21.1883 +5.40 -21.2263 +5.44 -21.3118 +5.48 -21.4700 +5.52 -21.6521 +5.56 -21.7926 +5.60 -21.8728 +5.64 -21.9090 +5.68 -21.9290 +5.72 -21.9539 +5.76 -22.0008 +5.80 -22.0678 +5.84 -22.1209 +5.88 -22.1521 +5.92 -22.1698 +5.96 -22.1804 +6.00 -22.1977 +6.04 -22.2178 +6.08 -22.2383 +6.12 -22.2459 +6.16 -22.2557 +6.20 -22.2736 +6.24 -22.3075 +6.28 -22.3657 +6.32 -22.4391 +6.36 -22.5207 +6.40 -22.5909 +6.44 -22.6490 +6.48 -22.6878 +6.52 -22.7148 +6.56 -22.7308 +6.60 -22.7361 +6.64 -22.7379 +6.68 -22.7283 +6.72 -22.7216 +6.76 -22.7102 +6.80 -22.7023 +6.84 -22.6962 +6.88 -22.6921 +6.92 -22.6959 +6.96 -22.6994 +7.00 -22.7050 +7.04 -22.7170 +7.08 -22.7249 +7.12 -22.7378 +7.16 -22.7480 +7.20 -22.7629 +7.24 -22.7710 +7.28 -22.7697 +7.32 -22.7655 +7.36 -22.7605 +7.40 -22.7565 +7.44 -22.7461 +7.48 -22.7323 +7.52 -22.7176 +7.56 -22.7039 +7.60 -22.6873 +7.64 -22.6700 +7.68 -22.6613 +7.72 -22.6436 +7.76 -22.6251 +7.80 -22.6071 +7.84 -22.5914 +7.88 -22.5727 +7.92 -22.5542 +7.96 -22.5360 +8.00 -22.5172 +8.04 -22.5014 +8.08 -22.4828 +8.12 -22.4642 +8.16 -22.4455 diff --git a/inputs/cooling_tables/schure.cooling_0.5Z b/inputs/cooling_tables/schure.cooling_0.5Z new file mode 100644 index 00000000..8f23fbce --- /dev/null +++ b/inputs/cooling_tables/schure.cooling_0.5Z @@ -0,0 +1,111 @@ +# Cooling rates generated from Schure 2009 (doi.org/10.1051/0004-6361/200912495) +# containing temperatures in the first column (in log10 K) and collisional ionisation +# equilibrium (CIE) cooling rates (in log10 erg cm^3/s). +# Cooling rates are in the convention Lambda_hd from eq. 1, +# where the proton ratio n_e/n_H is taken from table 2. +# Lambda_N is computed from eq. 3. The cooling rate Lambda_N(X_i,T) from eq. 3 is contained +# in table 4. n_i/n_i(solar) is taken to be 1.0 for all elements for Z=1 while for Z=0.5 +# and Z=0.3 n_i/n_i(solar) is set to 1 for H and He and set to 0.5 and 0.3 respectively for +# all other elements. Made by Forrest Glines (forrestglines@gmail.com) +# ----------------------------------------------------------------------------------------- +# log10 T [K] Z=0.5 log10 Lambda_N [erg cm^3/s] +4.20 -21.6106 +4.24 -21.4817 +4.28 -21.5094 +4.32 -21.5894 +4.36 -21.6708 +4.40 -21.7330 +4.44 -21.7528 +4.48 -21.7361 +4.52 -21.6873 +4.56 -21.6136 +4.60 -21.5229 +4.64 -21.4248 +4.68 -21.3330 +4.72 -21.2392 +4.76 -21.1599 +4.80 -21.0871 +4.84 -21.0286 +4.88 -20.9858 +4.92 -20.9582 +4.96 -20.9451 +5.00 -20.9602 +5.04 -20.9861 +5.08 -21.0079 +5.12 -21.0052 +5.16 -20.9968 +5.20 -20.9834 +5.24 -20.9707 +5.28 -20.9670 +5.32 -20.9647 +5.36 -20.9722 +5.40 -21.0099 +5.44 -21.0958 +5.48 -21.2556 +5.52 -21.4404 +5.56 -21.5834 +5.60 -21.6649 +5.64 -21.7010 +5.68 -21.7207 +5.72 -21.7454 +5.76 -21.7931 +5.80 -21.8615 +5.84 -21.9160 +5.88 -21.9476 +5.92 -21.9656 +5.96 -21.9760 +6.00 -21.9938 +6.04 -22.0144 +6.08 -22.0355 +6.12 -22.0433 +6.16 -22.0536 +6.20 -22.0725 +6.24 -22.1082 +6.28 -22.1698 +6.32 -22.2486 +6.36 -22.3375 +6.40 -22.4159 +6.44 -22.4820 +6.48 -22.5278 +6.52 -22.5612 +6.56 -22.5811 +6.60 -22.5905 +6.64 -22.5940 +6.68 -22.5857 +6.72 -22.5797 +6.76 -22.5694 +6.80 -22.5612 +6.84 -22.5573 +6.88 -22.5566 +6.92 -22.5635 +6.96 -22.5718 +7.00 -22.5831 +7.04 -22.6010 +7.08 -22.6169 +7.12 -22.6391 +7.16 -22.6596 +7.20 -22.6840 +7.24 -22.7021 +7.28 -22.7090 +7.32 -22.7121 +7.36 -22.7129 +7.40 -22.7135 +7.44 -22.7065 +7.48 -22.6959 +7.52 -22.6840 +7.56 -22.6722 +7.60 -22.6574 +7.64 -22.6418 +7.68 -22.6337 +7.72 -22.6173 +7.76 -22.5998 +7.80 -22.5828 +7.84 -22.5679 +7.88 -22.5500 +7.92 -22.5324 +7.96 -22.5152 +8.00 -22.4972 +8.04 -22.4822 +8.08 -22.4644 +8.12 -22.4467 +8.16 -22.4287 diff --git a/inputs/cooling_tables/schure.cooling_1.0Z b/inputs/cooling_tables/schure.cooling_1.0Z new file mode 100644 index 00000000..93aac5e5 --- /dev/null +++ b/inputs/cooling_tables/schure.cooling_1.0Z @@ -0,0 +1,111 @@ +# Cooling rates generated from Schure 2009 (doi.org/10.1051/0004-6361/200912495) +# containing temperatures in the first column (in log10 K) and collisional ionisation +# equilibrium (CIE) cooling rates (in log10 erg cm^3/s). +# Cooling rates are in the convention Lambda_hd from eq. 1, +# where the proton ratio n_e/n_H is taken from table 2. +# Lambda_N is computed from eq. 3. The cooling rate Lambda_N(X_i,T) from eq. 3 is contained +# in table 4. n_i/n_i(solar) is taken to be 1.0 for all elements for Z=1 while for Z=0.5 +# and Z=0.3 n_i/n_i(solar) is set to 1 for H and He and set to 0.5 and 0.3 respectively for +# all other elements. Made by Forrest Glines (forrestglines@gmail.com) +# ----------------------------------------------------------------------------------------- +# log10 T [K] Z=1.0 log10 Lambda_N [erg cm^3/s] +4.20 -21.6087 +4.24 -21.4779 +4.28 -21.5009 +4.32 -21.5702 +4.36 -21.6311 +4.40 -21.6603 +4.44 -21.6373 +4.48 -21.5738 +4.52 -21.4838 +4.56 -21.3771 +4.60 -21.2642 +4.64 -21.1525 +4.68 -21.0529 +4.72 -20.9557 +4.76 -20.8769 +4.80 -20.8078 +4.84 -20.7546 +4.88 -20.7154 +4.92 -20.6877 +4.96 -20.6713 +5.00 -20.6828 +5.04 -20.7056 +5.08 -20.7242 +5.12 -20.7180 +5.16 -20.7069 +5.20 -20.6912 +5.24 -20.6768 +5.28 -20.6720 +5.32 -20.6687 +5.36 -20.6755 +5.40 -20.7130 +5.44 -20.7993 +5.48 -20.9603 +5.52 -21.1472 +5.56 -21.2921 +5.60 -21.3746 +5.64 -21.4107 +5.68 -21.4301 +5.72 -21.4547 +5.76 -21.5029 +5.80 -21.5726 +5.84 -21.6281 +5.88 -21.6600 +5.92 -21.6782 +5.96 -21.6885 +6.00 -21.7067 +6.04 -21.7277 +6.08 -21.7494 +6.12 -21.7574 +6.16 -21.7680 +6.20 -21.7877 +6.24 -21.8248 +6.28 -21.8893 +6.32 -21.9727 +6.36 -22.0680 +6.40 -22.1536 +6.44 -22.2272 +6.48 -22.2797 +6.52 -22.3195 +6.56 -22.3434 +6.60 -22.3570 +6.64 -22.3622 +6.68 -22.3553 +6.72 -22.3501 +6.76 -22.3409 +6.80 -22.3324 +6.84 -22.3309 +6.88 -22.3340 +6.92 -22.3443 +6.96 -22.3580 +7.00 -22.3758 +7.04 -22.4007 +7.08 -22.4264 +7.12 -22.4606 +7.16 -22.4953 +7.20 -22.5331 +7.24 -22.5666 +7.28 -22.5865 +7.32 -22.6018 +7.36 -22.6128 +7.40 -22.6215 +7.44 -22.6209 +7.48 -22.6164 +7.52 -22.6101 +7.56 -22.6019 +7.60 -22.5907 +7.64 -22.5782 +7.68 -22.5715 +7.72 -22.5577 +7.76 -22.5421 +7.80 -22.5275 +7.84 -22.5143 +7.88 -22.4980 +7.92 -22.4822 +7.96 -22.4671 +8.00 -22.4508 +8.04 -22.4375 +8.08 -22.4215 +8.12 -22.4056 +8.16 -22.3893 diff --git a/inputs/cooling_tables/updated_schure.cooling b/inputs/cooling_tables/updated_schure.cooling deleted file mode 100644 index 3eecb9f0..00000000 --- a/inputs/cooling_tables/updated_schure.cooling +++ /dev/null @@ -1,111 +0,0 @@ -# Cooling rates generated from Schure 2009 (doi.org/10.1051/0004-6361/200912495) -# containing temperatures in the first column (in log10 K) and collisional ionisation -# equilibrium (CIE) cooling rates (in log10 erg cm^3/s) for Z=1 solar metalicity, Z=0.5, -# and Z=0.3 across the columns. Cooling rates are in the convention Lambda_hd from eq. 1, -# where the proton ratio n_e/n_H is taken from table 2. -# Lambda_N is computed from eq. 3. The cooling rate Lambda_N(X_i,T) from eq. 3 is contained -# in table 4. n_i/n_i(solar) is taken to be 1.0 for all elements for Z=1 while for Z=0.5 -# and Z=0.5 n_i/n_i(solar) is set to 1 for H and He and set to 0.5 and 0.3 respectively for -# all other elements. Made by Forrest Glines (forrestglines@gmail.com) -# ----------------------------------------------------------------------------------------- -# log10 T [K] Z=1 log10 Lambda_N [erg cm^3/s] Z=0.5 log10 Lambda_N [erg cm^3/s] Z=0.3 log10 Lambda_N [erg cm^3/s] -4.20 -21.6087 -21.6106 -21.6114 -4.24 -21.4779 -21.4817 -21.4833 -4.28 -21.5009 -21.5094 -21.5129 -4.32 -21.5702 -21.5894 -21.5974 -4.36 -21.6311 -21.6708 -21.6878 -4.40 -21.6603 -21.7330 -21.7659 -4.44 -21.6373 -21.7528 -21.8092 -4.48 -21.5738 -21.7361 -21.8230 -4.52 -21.4838 -21.6873 -21.8059 -4.56 -21.3771 -21.6136 -21.7621 -4.60 -21.2642 -21.5229 -21.6941 -4.64 -21.1525 -21.4248 -21.6111 -4.68 -21.0529 -21.3330 -21.5286 -4.72 -20.9557 -21.2392 -21.4387 -4.76 -20.8769 -21.1599 -21.3589 -4.80 -20.8078 -21.0871 -21.2816 -4.84 -20.7546 -21.0286 -21.2168 -4.88 -20.7154 -20.9858 -21.1700 -4.92 -20.6877 -20.9582 -21.1423 -4.96 -20.6713 -20.9451 -21.1331 -5.00 -20.6828 -20.9602 -21.1525 -5.04 -20.7056 -20.9861 -21.1820 -5.08 -20.7242 -21.0079 -21.2077 -5.12 -20.7180 -21.0052 -21.2093 -5.16 -20.7069 -20.9968 -21.2043 -5.20 -20.6912 -20.9834 -21.1937 -5.24 -20.6768 -20.9707 -21.1832 -5.28 -20.6720 -20.9670 -21.1811 -5.32 -20.6687 -20.9647 -21.1799 -5.36 -20.6755 -20.9722 -21.1883 -5.40 -20.7130 -21.0099 -21.2263 -5.44 -20.7993 -21.0958 -21.3118 -5.48 -20.9603 -21.2556 -21.4700 -5.52 -21.1472 -21.4404 -21.6521 -5.56 -21.2921 -21.5834 -21.7926 -5.60 -21.3746 -21.6649 -21.8728 -5.64 -21.4107 -21.7010 -21.9090 -5.68 -21.4301 -21.7207 -21.9290 -5.72 -21.4547 -21.7454 -21.9539 -5.76 -21.5029 -21.7931 -22.0008 -5.80 -21.5726 -21.8615 -22.0678 -5.84 -21.6281 -21.9160 -22.1209 -5.88 -21.6600 -21.9476 -22.1521 -5.92 -21.6782 -21.9656 -22.1698 -5.96 -21.6885 -21.9760 -22.1804 -6.00 -21.7067 -21.9938 -22.1977 -6.04 -21.7277 -22.0144 -22.2178 -6.08 -21.7494 -22.0355 -22.2383 -6.12 -21.7574 -22.0433 -22.2459 -6.16 -21.7680 -22.0536 -22.2557 -6.20 -21.7877 -22.0725 -22.2736 -6.24 -21.8248 -22.1082 -22.3075 -6.28 -21.8893 -22.1698 -22.3657 -6.32 -21.9727 -22.2486 -22.4391 -6.36 -22.0680 -22.3375 -22.5207 -6.40 -22.1536 -22.4159 -22.5909 -6.44 -22.2272 -22.4820 -22.6490 -6.48 -22.2797 -22.5278 -22.6878 -6.52 -22.3195 -22.5612 -22.7148 -6.56 -22.3434 -22.5811 -22.7308 -6.60 -22.3570 -22.5905 -22.7361 -6.64 -22.3622 -22.5940 -22.7379 -6.68 -22.3553 -22.5857 -22.7283 -6.72 -22.3501 -22.5797 -22.7216 -6.76 -22.3409 -22.5694 -22.7102 -6.80 -22.3324 -22.5612 -22.7023 -6.84 -22.3309 -22.5573 -22.6962 -6.88 -22.3340 -22.5566 -22.6921 -6.92 -22.3443 -22.5635 -22.6959 -6.96 -22.3580 -22.5718 -22.6994 -7.00 -22.3758 -22.5831 -22.7050 -7.04 -22.4007 -22.6010 -22.7170 -7.08 -22.4264 -22.6169 -22.7249 -7.12 -22.4606 -22.6391 -22.7378 -7.16 -22.4953 -22.6596 -22.7480 -7.20 -22.5331 -22.6840 -22.7629 -7.24 -22.5666 -22.7021 -22.7710 -7.28 -22.5865 -22.7090 -22.7697 -7.32 -22.6018 -22.7121 -22.7655 -7.36 -22.6128 -22.7129 -22.7605 -7.40 -22.6215 -22.7135 -22.7565 -7.44 -22.6209 -22.7065 -22.7461 -7.48 -22.6164 -22.6959 -22.7323 -7.52 -22.6101 -22.6840 -22.7176 -7.56 -22.6019 -22.6722 -22.7039 -7.60 -22.5907 -22.6574 -22.6873 -7.64 -22.5782 -22.6418 -22.6700 -7.68 -22.5715 -22.6337 -22.6613 -7.72 -22.5577 -22.6173 -22.6436 -7.76 -22.5421 -22.5998 -22.6251 -7.80 -22.5275 -22.5828 -22.6071 -7.84 -22.5143 -22.5679 -22.5914 -7.88 -22.4980 -22.5500 -22.5727 -7.92 -22.4822 -22.5324 -22.5542 -7.96 -22.4671 -22.5152 -22.5360 -8.00 -22.4508 -22.4972 -22.5172 -8.04 -22.4375 -22.4822 -22.5014 -8.08 -22.4215 -22.4644 -22.4828 -8.12 -22.4056 -22.4467 -22.4642 -8.16 -22.3893 -22.4287 -22.4455 diff --git a/src/hydro/srcterms/tabular_cooling.cpp b/src/hydro/srcterms/tabular_cooling.cpp index 9164f4cc..7143029b 100644 --- a/src/hydro/srcterms/tabular_cooling.cpp +++ b/src/hydro/srcterms/tabular_cooling.cpp @@ -33,8 +33,17 @@ TabularCooling::TabularCooling(ParameterInput *pin, const std::string table_filename = pin->GetString("cooling", "table_filename"); - const int log_temp_col = pin->GetOrAddInteger("cooling", "log_temp_col", 0); - const int log_lambda_col = pin->GetOrAddInteger("cooling", "log_lambda_col", 1); + // It should be fine to just issue a warning here. + // If an original cooling table with two columns was used, the behavior is the same. + // If not, then the test below on the number of columns in the file will fail. + if (Globals::my_rank == 0 && (pin->DoesParameterExist("cooling", "log_temp_col") || + pin->DoesParameterExist("cooling", "log_lambda_col"))) { + PARTHENON_WARN("\"cooling/log_temp_col\" or \"cooling/log_lambda_col\" found in" + "the parameter input.\n" + "These have been deprecated and only cooling tables for a single " + "metallicity containing the log10 temperature and log10 lambdas are " + "supported.\n"); + } const Real lambda_units_cgs = pin->GetReal("cooling", "lambda_units_cgs"); // Convert erg cm^3/s to code units @@ -109,16 +118,16 @@ TabularCooling::TabularCooling(ParameterInput *pin, std::vector line_data{std::istream_iterator{iss}, std::istream_iterator{}}; // Check size - if (line_data.empty() || line_data.size() <= std::max(log_temp_col, log_lambda_col)) { + if (line_data.empty() || line_data.size() != 2) { msg << "### FATAL ERROR in function [TabularCooling::TabularCooling]" << std::endl - << "Index " << std::max(log_temp_col, log_lambda_col) << " out of range on \"" - << line << "\"" << std::endl; + << "Expected exactly two columns per line but got: \"" << line << "\"" + << std::endl; PARTHENON_FAIL(msg); } try { - const Real log_temp = std::stod(line_data[log_temp_col]); - const Real log_lambda = std::stod(line_data[log_lambda_col]); + const Real log_temp = std::stod(line_data[0]); + const Real log_lambda = std::stod(line_data[1]); // Add to growing list log_temps.push_back(log_temp); diff --git a/tst/regression/test_suites/cluster_tabular_cooling/cluster_tabular_cooling.py b/tst/regression/test_suites/cluster_tabular_cooling/cluster_tabular_cooling.py index e04cdc60..1b4b0077 100644 --- a/tst/regression/test_suites/cluster_tabular_cooling/cluster_tabular_cooling.py +++ b/tst/regression/test_suites/cluster_tabular_cooling/cluster_tabular_cooling.py @@ -170,8 +170,6 @@ def Prepare(self, parameters, step): f"problem/cluster/uniform_gas/uz={self.uniform_gas_uz.in_units('code_length*code_time**-1').v}", f"problem/cluster/uniform_gas/pres={self.uniform_gas_pres.in_units('code_mass*code_length**-1*code_time**-2').v}", f"cooling/table_filename={table_filename}", - f"cooling/log_temp_col=0", - f"cooling/log_lambda_col=1", f"cooling/lambda_units_cgs=1", f"cooling/integrator={integrator}", f"cooling/cfl={cooling_cfl}",