Merge branch 'master' into pseudo

docs/latex/QuickStart/VeuszCookbook.tex

@@ -229,6 +229,7 @@ You can also place graphs within a grid widget to get an arrangement of separate
 Figure \ref{fig:orion_hii_pdr_pp} shows an example, 
 taken from the Orion HII region / PDR simulation, of a nested plot.
 
+
 \begin{figure}
 \begin{center}
 \includegraphics[clip=on,width=0.8\columnwidth,height=0.8\textheight,keepaspectratio]{orion_hii_pdr_pp}
@@ -239,4 +240,13 @@ Orion H II region / PDR.}
 \label{fig:orion_hii_pdr_pp}
 \end{figure}
 
+
+\subsection{Documenting your work}
+
+The Properties widget includes a Notes field that can be used to keep a history of the 
+data behind a plot.
+This is useful so that you can come back to a project after some time and recover
+the history of the work leading up to a result or the location of the helper files that were used
+along the way.
+
 %\end{document}

docs/latex/frontis_common.tex

 {\small
 \noindent
-{\em Software:} Copyright \copyright\ 1978-2019 Gary J. Ferland and others. All rights reserved.
+{\em Software:} Copyright \copyright\ 1978-2022 Gary J. Ferland and others. All rights reserved.
 
 \vspace{1em}
 
@@ -44,7 +44,7 @@ to the following FreeBSD format documentation license:
 \vspace{1em}
 
 \noindent
-{\em Documentation:} Copyright \copyright\ 1978--2019 Gary J. Ferland and others. All rights reserved.
+{\em Documentation:} Copyright \copyright\ 1978--2022 Gary J. Ferland and others. All rights reserved.
 
 \vspace{1em}
 

source/cool_eval.cpp

@@ -1293,9 +1293,9 @@ STATIC double CoolH2_GA08 ( double Temp )
 {
 	DEBUG_ENTRY( "CoolH2_GA08()" );
 
-	double x_para = h2.para_density / dense.gas_phase[ ipHYDROGEN ];
-	double x_ortho = h2.ortho_density / dense.gas_phase[ ipHYDROGEN ];
-	double f_para = h2.para_density / (h2.para_density + h2.ortho_density);
+	double x_para = safe_div( h2.para_density, double( dense.gas_phase[ ipHYDROGEN ] ) );
+	double x_ortho = safe_div( h2.ortho_density, double( dense.gas_phase[ ipHYDROGEN ] ) );
+	double f_para = safe_div( h2.para_density, h2.para_density + h2.ortho_density );
 	double f_ortho = 1. - f_para;
 
 	/* Collisions with atomic H */
@@ -1354,14 +1354,10 @@ STATIC double CoolH2_GA08 ( double Temp )
 		}
 	}
 
-	/* NB NB NB
-	 * 
-	 * The interpolation below will fail if the high density cooling is 0,
-	 * that is, the total cooling will be 0, even if the low-density cooling
-	 * is not.  This may happen if permitted by the function that computes
-	 * LTE cooling, and/or the tabulated data (see definition of
-	 * interpolate_LTE_Cooling() and associated data file). */
-	return cooling_high / (1. + cooling_high / cooling_low);
+	// originally cooling_high / (1. + cooling_high / cooling_low)
+	// See Eq. (39) therein
+	//
+	return safe_div( cooling_low * cooling_high, cooling_low + cooling_high );
 }
 
 STATIC void CoolHyperfine (void)

source/hextra.h

@@ -109,7 +109,7 @@ struct t_hextra : public module {
 		 hextra.background_density = 1.99e-9f;*/
 		/* >>chng 05 apr 16, to get proper ionization rate in ism_set_cr_rate, where
 		 * H is forced to be fully atomic, no molecules, density from 1.99 to 2.15 */
-		/* >>chng 02 apr 05, update to
+		/* >>chng 12 apr 05, update to
 		 * >>refer	cosmic ray 	ionization	Indriolo, N., Geballe, T., Oka, T., & McCall, B.J. 2007, ApJ, 671, 1736
 		 */
 		background_density = 2.15e-9f*7.9f;

tsuite/slow/h2_th85orion.in

@@ -39,7 +39,7 @@ normalize to "C  2" 157.636m
 sphere
 ## >>chng 16 apr 14, had been case B, this gets same effect with
 ## no large Lyman optical depths
-Database H-like Lyman pumping off
+database H-like Lyman pumping off
 cosmic rays, background
 ##
 ## stopping criteria

tsuite/slow/star_kurucz_39600.dat

-../auto/star_kurucz_39600.dat
\ No newline at end of file