Cleanup cosmology + parameters

#23 (closed)

src/csds_cosmology.cpp

@@ -25,45 +25,38 @@
 #include "csds_tools.hpp"
 
 /**
- * @brief Compute the first time derivative of the scale factor
- *
- * @param cosmo The cosmological model
- * @param scale The scale factor
- *
- * @return The first derivative of the scale factor.
+ * @brief Initialize the #Cosmology from a file.
  */
-void csds_cosmology_init(struct csds_cosmology *cosmo,
-                         struct csds_parser *params) {
+Cosmology::Cosmology(struct csds_parser &params) {
 
   /* Read Omega_cdm */
-  cosmo->Omega_cdm = parser_get_param_double(params, "Cosmology:Omega_cdm");
+  mOmegaCdm = parser_get_param_double(params, "Cosmology:Omega_cdm");
 
   /* Read Omega_lambda */
-  cosmo->Omega_lambda =
-      parser_get_param_double(params, "Cosmology:Omega_lambda");
+  mOmegaLambda = parser_get_param_double(params, "Cosmology:Omega_lambda");
 
   /* Read Omega_b */
-  cosmo->Omega_b = parser_get_param_double(params, "Cosmology:Omega_b");
+  mOmegaBaryon = parser_get_param_double(params, "Cosmology:Omega_b");
 
   /* Read Omega_r */
-  cosmo->Omega_r = parser_get_param_double(params, "Cosmology:Omega_r");
+  mOmegaRadiation = parser_get_param_double(params, "Cosmology:Omega_r");
 
   /* Read Omega_k */
-  cosmo->Omega_k = parser_get_param_double(params, "Cosmology:Omega_k");
+  mOmegaCurvature = parser_get_param_double(params, "Cosmology:Omega_k");
 
   /* Read Omega_nu_0 */
-  double Omega_nu_0 =
+  double omega_nu_0 =
       parser_get_opt_param_double(params, "Cosmology:Omega_nu_0", 0);
 
-  if (Omega_nu_0 != 0)
+  if (omega_nu_0 != 0)
     csds_error("Neutrinos are not implemented in the cosmology.");
 
   /* Read w_0 */
-  cosmo->w_0 = parser_get_param_double(params, "Cosmology:w_0");
+  mW0 = parser_get_param_double(params, "Cosmology:w_0");
 
   /* Read w_a */
-  cosmo->w_a = parser_get_param_double(params, "Cosmology:w_a");
+  mWa = parser_get_param_double(params, "Cosmology:w_a");
 
   /* Read the Hubble constant at z=0 */
-  cosmo->H0 = parser_get_param_double(params, "Cosmology:Hubble0");
+  mH0 = parser_get_param_double(params, "Cosmology:Hubble0");
 }