removed user option check_state_approach

hombit · Dec 11, 2024 · 20fc0d4 · 20fc0d4
1 parent 1e5d047
commit 20fc0d4
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 16 deletions.
diff --git a/cpp/include/arguments.hpp b/cpp/include/arguments.hpp
@@ -182,7 +182,7 @@ class DiskStructureArguments {
 	constexpr static const double default_Tirr2Tvishot = 0.;
 	constexpr static const double default_Rfront_Mdotzero_factor = 1.;
 	constexpr static const double default_DIM_front_Mdot_factor = 2.3;
-        constexpr static const char default_check_state_approach[] = "before2024";
+        //constexpr static const char default_check_state_approach[] = "before2024";
         constexpr static const char default_check_Sigma_approach[] = "simple";
 	constexpr static const char default_check_Temp_approach[] = "const";
 	constexpr static const char default_DIM_front_approach[] = "maxFvis";
@@ -200,7 +200,7 @@ class DiskStructureArguments {
 	double Tirr2Tvishot;
 	double Rfront_Mdotzero_factor;
 	double DIM_front_Mdot_factor;
-	std::string check_state_approach;
+	//std::string check_state_approach;
 	std::string check_Sigma_approach;
 	std::string check_Temp_approach;
 	std::string DIM_front_approach;
@@ -230,7 +230,7 @@ class DiskStructureArguments {
 			double Tirr2Tvishot,
 			double Rfront_Mdotzero_factor, 
 			double DIM_front_Mdot_factor, 
-			const std::string& check_state_approach, 
+			//const std::string& check_state_approach, 
 			const std::string& check_Sigma_approach, 
 			const std::string& check_Temp_approach,
 			const std::string& DIM_front_approach,
@@ -253,7 +253,7 @@ class DiskStructureArguments {
 			double Tirr2Tvishot,
 			double Rfront_Mdotzero_factor,
 			double DIM_front_Mdot_factor,
-			const std::string &check_state_approach,
+			//const std::string &check_state_approach,
 			const std::string &check_Sigma_approach,
 			const std::string &check_Temp_approach,
 			const std::string &DIM_front_approach,
@@ -270,7 +270,7 @@ class DiskStructureArguments {
 			Tirr2Tvishot(Tirr2Tvishot),
 			Rfront_Mdotzero_factor(Rfront_Mdotzero_factor),
 			DIM_front_Mdot_factor(DIM_front_Mdot_factor),
-			check_state_approach(check_state_approach), 
+			//check_state_approach(check_state_approach), 
 			check_Sigma_approach(check_Sigma_approach),
 			check_Temp_approach(check_Temp_approach),
 			DIM_front_approach(DIM_front_approach),

diff --git a/cpp/include/ns/ns_arguments.hpp b/cpp/include/ns/ns_arguments.hpp
@@ -114,7 +114,8 @@ class NeutronStarDiskStructureArguments: public DiskStructureArguments {
 			const std::string& opacity,
 			double Mdotout,
 			const std::string& boundcond, double Thot, double Tirr2Tvishot,
-			double Rfront_Mdotzero_factor, double DIM_front_Mdot_factor, const std::string& check_state_approach, const std::string& check_Sigma_approach, const std::string& check_Temp_approach,
+			double Rfront_Mdotzero_factor, double DIM_front_Mdot_factor, //const std::string& check_state_approach, 
+			const std::string& check_Sigma_approach, const std::string& check_Temp_approach,
 			const std::string& DIM_front_approach, const std::string& scatter_by_corona,
 			const std::string& initialcond,
 			std::optional<double> F0,

diff --git a/cpp/src/arguments.cpp b/cpp/src/arguments.cpp
@@ -34,7 +34,8 @@ DiskStructureArguments::DiskStructureArguments(
 		const std::string& opacity,
 		double Mdotout,
 		const std::string& boundcond, double Thot, double Tirr2Tvishot,
-		double Rfront_Mdotzero_factor, double DIM_front_Mdot_factor, const std::string& check_state_approach, 
+		double Rfront_Mdotzero_factor, double DIM_front_Mdot_factor, 
+		//const std::string& check_state_approach, 
 		const std::string& check_Sigma_approach,
 		const std::string& check_Temp_approach,
 		const std::string& DIM_front_approach,
@@ -52,7 +53,8 @@ DiskStructureArguments::DiskStructureArguments(
 		boundcond(boundcond),
 		Thot(Thot),
 		Tirr2Tvishot(Tirr2Tvishot),
-		Rfront_Mdotzero_factor(Rfront_Mdotzero_factor), DIM_front_Mdot_factor(DIM_front_Mdot_factor), check_state_approach(check_state_approach),check_Sigma_approach(check_Sigma_approach), check_Temp_approach(check_Temp_approach),
+		Rfront_Mdotzero_factor(Rfront_Mdotzero_factor), DIM_front_Mdot_factor(DIM_front_Mdot_factor), //check_state_approach(check_state_approach),
+		check_Sigma_approach(check_Sigma_approach), check_Temp_approach(check_Temp_approach),
 		DIM_front_approach(DIM_front_approach),scatter_by_corona(scatter_by_corona),
 		initialcond(initialcond),
 		initial_F_function(initializeInitialFFunction(oprel,

diff --git a/cpp/src/ns/ns_arguments.cpp b/cpp/src/ns/ns_arguments.cpp
@@ -117,7 +117,7 @@ NeutronStarDiskStructureArguments::NeutronStarDiskStructureArguments(
 		const std::string& boundcond, double Thot, double Tirr2Tvishot,
 		double Rfront_Mdotzero_factor,
 		double DIM_front_Mdot_factor,
-		const std::string& check_state_approach, 
+		//const std::string& check_state_approach, 
 		const std::string& check_Sigma_approach,
 		const std::string& check_Temp_approach,
 		const std::string& DIM_front_approach,
@@ -133,7 +133,8 @@ NeutronStarDiskStructureArguments::NeutronStarDiskStructureArguments(
 						  boundcond, Thot, Tirr2Tvishot,
 						  Rfront_Mdotzero_factor, 
 						  DIM_front_Mdot_factor,
-						  check_state_approach, check_Sigma_approach,  
+						  //check_state_approach, 
+						  check_Sigma_approach,  
 						  check_Temp_approach,  DIM_front_approach,			    scatter_by_corona,
 						  initialcond,
 						  initializeInitialFFunctionNS(OpacityRelated(opacity, bdb_args.Mx, bdb_args.alpha, mu),

diff --git a/cpp/src/ns/ns_options.cpp b/cpp/src/ns/ns_options.cpp
@@ -188,7 +188,7 @@ NeutronStarDiskStructureOptions::NeutronStarDiskStructureOptions(const po::varia
 				std::pow(vm["Qirr2Qvishot"].as<double>(), 0.25),
 				vm["Rfront_Mdotzero_factor"].as<double>(),     
 				vm["DIM_front_Mdot_factor"].as<double>(),     
-				vm["check_state_approach"].as<std::string>(),       
+				//vm["check_state_approach"].as<std::string>(),       
 				vm["check_Sigma_approach"].as<std::string>(),     		vm["check_Temp_approach"].as<std::string>(),
 				vm["DIM_front_approach"].as<std::string>(),
 				vm["scatter_by_corona"].as<std::string>(),

diff --git a/cpp/src/options.cpp b/cpp/src/options.cpp
@@ -103,7 +103,7 @@ DiskStructureOptions::DiskStructureOptions(const po::variables_map &vm, const Ba
 				std::pow(vm["Qirr2Qvishot"].as<double>(), 0.25),
 				vm["Rfront_Mdotzero_factor"].as<double>(), 
 				vm["DIM_front_Mdot_factor"].as<double>(),        
-				vm["check_state_approach"].as<std::string>(),       
+				//vm["check_state_approach"].as<std::string>(),       
 				vm["check_Sigma_approach"].as<std::string>(),
 				vm["check_Temp_approach"].as<std::string>(),
 				vm["DIM_front_approach"].as<std::string>(),
@@ -230,10 +230,10 @@ po::options_description DiskStructureOptions::description() {
 			( "Qirr2Qvishot", po::value<double>()->default_value(m::pow<4>(default_Tirr2Tvishot)), "Minimum Qirr / Qvis ratio at the outer edge of the hot disk to switch the control over the evolution of the hot disk radius: from temperature-based regime to Sigma-based cooling-front regime (see Lipunova et al. (2021, Section 2.4) and Eq. A.1 in Lasota et al. 2008; --alpha value is used for Sigma_plus and --alphacold value is used for Sigma_minus)\n" )
 			("Rfront_Mdotzero_factor", po::value<double>()->default_value(default_Rfront_Mdotzero_factor), "We check conditions for cooling front at current radius multiplied by Rfront_Mdotzero_factor\n" )
 			("DIM_front_Mdot_factor", po::value<double>()->default_value(default_DIM_front_Mdot_factor), "  = -Mdot(Rfront)/Mdot_in, see DIM_front_approach\n" )
-			("check_state_approach", po::value<std::string>()->default_value(default_check_state_approach), "Type of checking whether the ring is hot or cold\n\n"
-					"Values:\n"
-					" before2024: original version, as published in Lipunova&Malanchev (2017); Lipunova et al (2022); Avakyan et al (2024)\n"
-					" logic: included option for checking conditions at radius different from the radius where accretion rate is zero. See boundcond, DIM_front_approach, scatter_by_corona,  check_Sigma_approach, and check_Temp_approach\n")
+			//("check_state_approach", po::value<std::string>()->default_value(default_check_state_approach), "Type of checking whether the ring is hot or cold\n\n"
+			//		"Values:\n"
+			//		" before2024: original version, as published in Lipunova&Malanchev (2017); Lipunova et al (2022); Avakyan et al (2024)\n"
+			//		" logic: included option for checking conditions at radius different from the radius where accretion rate is zero. See boundcond, DIM_front_approach, scatter_by_corona,  check_Sigma_approach, and check_Temp_approach\n")
 			("check_Sigma_approach", po::value<std::string>()->default_value(default_check_Sigma_approach), "Type of checking Sigma for hot or cold state\n\n"
 					"Values:\n"
 					" simple: assume that Sigma is proportional to R^(-3/4) between radius where Mdot = 0 and the cooling fron radius\n"