clean up

Author: chongchonghe

.ci/azure-pipelines-amdgpu.yml

@@ -110,12 +110,12 @@ jobs:
         CCACHE_BASEDIR: $(Build.SourcesDirectory)
         CCACHE_NOHASHDIR: 1
       inputs:
-        cmakeArgs: '--build . --parallel 16 --target StarCluster'
+        cmakeArgs: '--build . --parallel 16 --target GravRadParticle3D'
 
     - task: CMake@1
       displayName: 'Run CTest'
       inputs:
-        cmakeArgs: '-E chdir . ctest -R StarCluster -T Test --output-on-failure'
+        cmakeArgs: '-E chdir . ctest -R GravRadParticle3D -T Test --output-on-failure'
 
     - task: PublishTestResults@2
       inputs:

.ci/azure-pipelines.yml

@@ -109,12 +109,12 @@ jobs:
         CCACHE_BASEDIR: $(Build.SourcesDirectory)
         CCACHE_NOHASHDIR: 1
       inputs:
-        cmakeArgs: '--build . --parallel 16 --target StarCluster'
+        cmakeArgs: '--build . --parallel 16 --target GravRadParticle3D'
 
     - task: CMake@1
       displayName: 'Run CTest'
       inputs:
-        cmakeArgs: '-E chdir . ctest -R StarCluster -T Test --output-on-failure'
+        cmakeArgs: '-E chdir . ctest -R GravRadParticle3D -T Test --output-on-failure'
 
     - task: PublishTestResults@2
       inputs:

inputs/SphericalCollapse.in

@@ -22,7 +22,7 @@ amr.grid_eff        = 1.0
 
 hydro.reconstruction_order = 3  # PPM
 cfl = 0.25
-max_timesteps = 1
+max_timesteps = 50000
 stop_time = 0.05
 
 derived_vars = gpot
@@ -34,5 +34,3 @@ do_tracers = 0          # turn on tracer particles
 ascent_interval = 100
 plotfile_interval = 200
 checkpoint_interval = 1000
-
-density_floor_expr = "0.1 * (1.0 - sqrt(x*x + y*y + z*z))"

inputs/StarCluster.in

@@ -22,7 +22,7 @@ amr.grid_eff        = 0.7   # default
 
 hydro.reconstruction_order = 3  # PPM
 cfl = 0.2
-max_timesteps = 1
+max_timesteps = 300
 stop_time = 0.5             # t_ff = 0.55
 
 gravity.Gconst = 1.0    #gravitational constant
@@ -46,5 +46,3 @@ derived_vars = log_density
 
 amrex.throw_exception = 0
 amrex.signal_handling = 1
-
-density_floor_expr = "1.0 - (sqrt(x*x + y*y + z*z)/10.0)"

src/problems/SphericalCollapse/testSphericalCollapse.cpp

@@ -7,17 +7,12 @@
 /// \brief Defines a test problem for pressureless spherical collapse.
 ///
 #include "hydro/hydro_system.hpp"
-#include "math/interpolate.hpp"
-#include <limits>
 
 #include "AMReX_BLassert.H"
 #include "AMReX_MultiFab.H"
 #include "AMReX_ParmParse.H"
 #include "QuokkaSimulation.hpp"
-#include "util/fextract.hpp"
-#ifdef HAVE_PYTHON
-#include "util/matplotlibcpp.h"
-#endif
+#include "util/BC.hpp"
 
 struct GlobalConfig {
 	static int num_particles;
@@ -143,13 +138,6 @@ template <> void QuokkaSimulation<CollapseProblem>::ComputeDerivedVar(int lev, s
 	}
 }
 
-// A GPU helper function to set up the density floor
-auto localDensityFloor(amrex::Real x, amrex::Real y, amrex::Real z) -> amrex::Real
-{
-	// density_floor_expr = "0.1 * (1.0 - sqrt(x*x + y*y + z*z))"
-	return 0.1 * (1.0 - std::sqrt(x * x + y * y + z * z));
-}
-
 auto problem_main() -> int
 {
 	amrex::ParmParse const pp("problem");
@@ -158,64 +146,13 @@ auto problem_main() -> int
 
 	// Problem initialization
 	QuokkaSimulation<CollapseProblem> sim;
-	sim.densityFloor_ = 1.0e-5;
 
 	// initialize
 	sim.setInitialConditions();
 
-	// read output variables
-	auto [position, values] = fextract(sim.state_new_cc_[0], sim.Geom(0), 2, 0.0, true); // z direction
-	const int nz = static_cast<int>(position.size());
-
-	// extract density and check floor
-	std::vector<double> zs(nz);
-	std::vector<double> rho_z(nz);
-	std::vector<double> custom_floor_z(nz);
-	amrex::Real min_density = std::numeric_limits<amrex::Real>::max();
-	amrex::Real min_density_ratio = std::numeric_limits<amrex::Real>::max();
-	for (int i = 0; i < nz; ++i) {
-		amrex::Real const z = position[i];
-		custom_floor_z.at(i) = localDensityFloor(0.0, 0.0, z); // note that the real x and y are 0.5 * delta_x
-		amrex::Real const rho = values.at(HydroSystem<CollapseProblem>::density_index)[i];
-		zs.at(i) = z;
-		rho_z.at(i) = rho;
-		min_density = std::min(min_density, rho);
-		min_density_ratio = std::min(min_density_ratio, rho / custom_floor_z.at(i));
-	}
-
-	// Check that custom floor is working: min_density_ratio should not be smaller than 0.98
-	int status = 0;
-	if (min_density_ratio > 0.99) {
-		amrex::Print() << "Custom density floor test PASSED: min density ratio = " << min_density_ratio << " > 0.99\n";
-	} else {
-		amrex::Print() << "Custom density floor test FAILED: min density ratio = " << min_density_ratio << " < 0.99\n";
-		status = 1;
-	}
-
-#ifdef HAVE_PYTHON
-	// Plot results
-	matplotlibcpp::clf();
-
-	std::map<std::string, std::string> rho_args;
-	std::map<std::string, std::string> custom_floor_args;
-	rho_args["label"] = "rho";
-	rho_args["linestyle"] = "-";
-	rho_args["color"] = "C0";
-	custom_floor_args["label"] = "custom floor";
-	custom_floor_args["linestyle"] = "--";
-	custom_floor_args["color"] = "C1";
-	matplotlibcpp::plot(zs, rho_z, rho_args);
-	matplotlibcpp::plot(zs, custom_floor_z, custom_floor_args);
-	matplotlibcpp::ylim(1.0e-3, 11.0);
-	matplotlibcpp::yscale("log");
-
-	matplotlibcpp::legend();
-	matplotlibcpp::title("Spherical Collapse with custom floor");
-	matplotlibcpp::save("./spherical_collapse_density_floor_z.pdf");
-#endif // HAVE_PYTHON
-
 	// evolve
 	sim.evolve();
 
+	int const status = 0;
 	return status;
 }

src/problems/StarCluster/testStarCluster.cpp

@@ -24,10 +24,6 @@
 #include "AMReX_Print.H"
 #include "AMReX_SPACE.H"
 #include "AMReX_TableData.H"
-#include "util/fextract.hpp"
-#ifdef HAVE_PYTHON
-#include "util/matplotlibcpp.h"
-#endif
 
 #include "QuokkaSimulation.hpp"
 #include "hydro/EOS.hpp"
@@ -212,17 +208,6 @@ template <> void QuokkaSimulation<StarCluster>::ComputeDerivedVar(int lev, std::
 	}
 }
 
-// A GPU helper function to set up the density floor
-auto localDensityFloor(amrex::Real x, amrex::Real y, amrex::Real z) -> amrex::Real
-{
-	amrex::Real r = std::sqrt(x * x + y * y + z * z);
-	const Real rho_base_floor = 0.001;
-	const Real rho_peak = 1.0;
-	const Real r_max = 10.0;
-	amrex::Real custom_floor = std::max(rho_base_floor, rho_peak * (1.0 - (r / r_max)));
-	return custom_floor;
-}
-
 auto problem_main() -> int
 {
 	// read problem parameters
@@ -251,59 +236,9 @@ auto problem_main() -> int
 	// initialize
 	sim.setInitialConditions();
 
-	// read output variables
-	auto [position, values] = fextract(sim.state_new_cc_[0], sim.Geom(0), 2, 0.0, true); // z direction
-	const int nz = static_cast<int>(position.size());
-
-	// extract density and check floor
-	std::vector<double> zs(nz);
-	std::vector<double> rho_z(nz);
-	std::vector<double> custom_floor_z(nz);
-	amrex::Real min_density = std::numeric_limits<amrex::Real>::max();
-	amrex::Real min_density_ratio = std::numeric_limits<amrex::Real>::max();
-	for (int i = 0; i < nz; ++i) {
-		amrex::Real const z = position[i];
-		custom_floor_z.at(i) = localDensityFloor(0.0, 0.0, z); // note that the real x and y are 0.5 * delta_x
-		amrex::Real const rho = values.at(HydroSystem<StarCluster>::density_index)[i];
-		zs.at(i) = z;
-		rho_z.at(i) = rho;
-		min_density = std::min(min_density, rho);
-		min_density_ratio = std::min(min_density_ratio, rho / custom_floor_z.at(i));
-	}
-
-	// Check that custom floor is working: min_density_ratio should not be smaller than 1
-	int status = 0;
-	if (min_density_ratio > 0.99) {
-		amrex::Print() << "Custom density floor test PASSED: min density ratio = " << min_density_ratio << " > 0.99\n";
-	} else {
-		amrex::Print() << "Custom density floor test FAILED: min density ratio = " << min_density_ratio << " < 0.99\n";
-		status = 1;
-	}
-
-#ifdef HAVE_PYTHON
-	// Plot results
-	matplotlibcpp::clf();
-
-	std::map<std::string, std::string> rho_args;
-	std::map<std::string, std::string> custom_floor_args;
-	rho_args["label"] = "rho";
-	rho_args["linestyle"] = "-";
-	rho_args["color"] = "C0";
-	custom_floor_args["label"] = "custom floor";
-	custom_floor_args["linestyle"] = "--";
-	custom_floor_args["color"] = "C1";
-	matplotlibcpp::plot(zs, rho_z, rho_args);
-	matplotlibcpp::plot(zs, custom_floor_z, custom_floor_args);
-	matplotlibcpp::ylim(0.001, 1.1);
-
-	matplotlibcpp::legend();
-	matplotlibcpp::title("With custom floor");
-	matplotlibcpp::save("./star_cluster_density_floor_z.pdf");
-#endif // HAVE_PYTHON
-
 	// evolve
 	sim.evolve();
 
-	amrex::Print() << "Finished." << '\n';
+	int const status = 0;
 	return status;
 }