Added spins to config file and got rid of more _act arrays

2020-04-08 20:38:36 -04:00 · 2020-04-08 20:38:36 -04:00 · 75ad0f0e89
commit 75ad0f0e89
parent ebec3280f8
4 changed files with 178 additions and 185 deletions
--- a/config.h
+++ b/config.h
@ -7,48 +7,50 @@ class Config {
 public:
    Config(std::string file_name);

-    double           eps;
-    double           t_end;
-    double           dt_disk;
-    double           dt_contr;
-    double           dt_bh;
-    double           eta;
-    std::string      input_file_name;
-    int              devices_per_node;
-    bool             dt_min_warning;
+    double              eps;
+    double              t_end;
+    double              dt_disk;
+    double              dt_contr;
+    double              dt_bh;
+    double              eta;
+    std::string         input_file_name;
+    int                 devices_per_node;
+    bool                dt_min_warning;
+   
+    bool                output_hdf5;
+    bool                output_hdf5_double_precision;
+    int                 output_ascii_precision;
+    int                 output_extra_mode;
+   
+    int                 live_smbh_count;
+    double              live_smbh_custom_eps;
+    bool                live_smbh_output;
+    bool                live_smbh_neighbor_output;
+    int                 live_smbh_neighbor_number;
+   
+    bool                binary_smbh_pn;
+    bool                binary_smbh_influence_sphere_output;
+    double              binary_smbh_influence_radius_factor;
+    std::vector<int>    pn_usage;
+    double              pn_c;
+    std::vector<double> smbh1_spin;
+    std::vector<double> smbh2_spin;

-    bool             output_hdf5;
-    bool             output_hdf5_double_precision;
-    int              output_ascii_precision;
-    int              output_extra_mode;
-
-    int              live_smbh_count;
-    double           live_smbh_custom_eps;
-    bool             live_smbh_output;
-    bool             live_smbh_neighbor_output;
-    int              live_smbh_neighbor_number;
-
-    bool             binary_smbh_pn;
-    bool             binary_smbh_influence_sphere_output;
-    double           binary_smbh_influence_radius_factor;
-    std::vector<int> pn_usage;
-    double           pn_c;
-
-    bool             ext_units_physical;
-    double           unit_mass;
-    double           unit_length;
-    double           ext_m_bulge;
-    double           ext_b_bulge;
-    double           ext_m_disk;
-    double           ext_a_disk;
-    double           ext_b_disk;
-    double           ext_m_halo_plummer;
-    double           ext_b_halo_plummer;
-    double           ext_log_halo_r;
-    double           ext_log_halo_v;
-    double           ext_dehnen_m;
-    double           ext_dehnen_r;
-    double           ext_dehnen_gamma;
+    bool                ext_units_physical;
+    double              unit_mass;
+    double              unit_length;
+    double              ext_m_bulge;
+    double              ext_b_bulge;
+    double              ext_m_disk;
+    double              ext_a_disk;
+    double              ext_b_disk;
+    double              ext_m_halo_plummer;
+    double              ext_b_halo_plummer;
+    double              ext_log_halo_r;
+    double              ext_log_halo_v;
+    double              ext_dehnen_m;
+    double              ext_dehnen_r;
+    double              ext_dehnen_gamma;

 private:
    using Dictionary = std::unordered_map<std::string,std::string>;