Fixing const-related compilation problems

hombit · Nov 26, 2024 · eaa0c65 · eaa0c65
1 parent 2e36197
commit eaa0c65
Show file tree

Hide file tree

Showing 5 changed files with 155 additions and 606 deletions.
diff --git a/cpp/include/freddi_evolution.hpp b/cpp/include/freddi_evolution.hpp
@@ -45,6 +45,10 @@ class FreddiEvolution: public FreddiState {
 protected:
 	virtual void truncateOuterRadius();
 	virtual void truncateInnerRadius() {}
+protected:
+    // To be used inside truncateOuterRadius only
+    // It is not const because it changes R_dotM0_before_shift
+    bool check_ring_is_cold(const int i); // check ring hot (false) or cold (true)
 protected:
 	virtual vecd wunction(const vecd& h, const vecd& F, size_t first, size_t last) const;
 public:

diff --git a/cpp/include/freddi_state.hpp b/cpp/include/freddi_state.hpp
@@ -448,7 +448,6 @@ class FreddiState {
 	double R_vis_struct (double r, double z2r_at_r) const;
 	double v_cooling_front(double r, double sigma_at_r) const;
 	double v_visc(double r, double z2r) const;
-	int check_ring_is_cold(const int i) const; // check ring hot (1) or cold (0)
 	int Tirr_exceed_critical(const int i) const; // check Tirr > Tcrit (1) or not (0)
 };