From 18b55ecb329ee012271e670842aee9a3c9225c1d Mon Sep 17 00:00:00 2001
From: Stefan Arridge <stefan.arridge@durham.ac.uk>
Date: Fri, 9 Sep 2016 16:35:40 +0100
Subject: [PATCH] Edited cooling function data in constant lambda cooling:
lambda stored as a double, removed min_temperature and min_energy_cgs
---
src/cooling/const_lambda/cooling.h | 18 ------------------
src/cooling/const_lambda/cooling_struct.h | 12 ++++--------
2 files changed, 4 insertions(+), 26 deletions(-)
diff --git a/src/cooling/const_lambda/cooling.h b/src/cooling/const_lambda/cooling.h
index 0a5672a63e..a55fd86ff4 100644
--- a/src/cooling/const_lambda/cooling.h
+++ b/src/cooling/const_lambda/cooling.h
@@ -35,24 +35,6 @@
#include "physical_constants.h"
#include "units.h"
-/* Cooling Properties */
-struct cooling_data {
-
- /*! Cooling rate in cgs units. Defined by 'rho * du/dt = -lambda * n_H^2'*/
- double lambda;
-
- /*! Fraction of gas mass that is Hydrogen. Used to calculate n_H*/
- float hydrogen_mass_abundance;
-
- /* 'mu', used to convert min_temperature to min_internal energy*/
- float mean_molecular_weight;
-
- /*! Minimally allowed internal energy of the particles */
- float min_energy;
-
- /*! Constant multiplication factor for time-step criterion */
- float cooling_tstep_mult;
-};
/**
* @brief Calculates du/dt in code units for a particle.
diff --git a/src/cooling/const_lambda/cooling_struct.h b/src/cooling/const_lambda/cooling_struct.h
index 27c5df16bf..6226ca3179 100644
--- a/src/cooling/const_lambda/cooling_struct.h
+++ b/src/cooling/const_lambda/cooling_struct.h
@@ -29,20 +29,16 @@
struct cooling_function_data {
/*! Cooling rate in cgs units. Defined by 'rho * du/dt = -lambda * n_H^2'*/
- float lambda;
+ double lambda;
- /*! Minimum temperature (in Kelvin) for all gas particles*/
- float min_temperature;
-
- /*! Fraction of gas mass that is Hydrogen. Used to calculate n_H*/
+ /*! Fraction of gas mass that is Hydrogen. Used to calculate n_H */
float hydrogen_mass_abundance;
- /* 'mu', used to convert min_temperature to min_internal energy*/
+ /*! 'mu', used to convert min_temperature to min_internal energy */
float mean_molecular_weight;
- /*! Minimally allowed internal energy of the particles */
+ /*! Minimally allowed internal energy of all the particles */
float min_energy;
- float min_energy_cgs;
/*! Constant multiplication factor for time-step criterion */
float cooling_tstep_mult;
--
GitLab