Added a mesh for comparison with comsol and tiny refactoring.

eimrek · May 15, 2017 · 476206b · 476206b
1 parent 95756ce
commit 476206b
Show file tree

Hide file tree

Showing 4 changed files with 2,656 additions and 9 deletions.
diff --git a/include/currents_and_heating.h b/include/currents_and_heating.h
@@ -91,14 +91,14 @@ namespace fch {
 		 * @param out_fname if file_output is set to true, then the newton iterations are saved to files <out_fname>-<N#>.vtk,
 		 * 					where N# is the number of the newton iteration
 		 * @param print boolean if calculation info should be output to cout
-		 * @param alpha successive over-relaxation coefficient
+		 * @param sor_alpha successive over-relaxation coefficient
 		 * @param ic_interp_treshold peak temperature value of the previous iteration, which determines if interpolation is done
 		 * @param skip_field_mapping skip the (cell face) <-> (field) mapping on the surface; the field BC must be set by other means
 		 * @return final temperature error
 		 */
 		double run_specific(double temperature_tolerance=1.0, int max_newton_iter=10,
 						  bool file_output=true, std::string out_fname="sol", bool print=true,
-						  double alpha=1.0, double ic_interp_treshold = 400, bool skip_field_mapping=false);
+						  double sor_alpha=1.0, double ic_interp_treshold = 400, bool skip_field_mapping=false);
 
 		/** getter for the mesh */
 		Triangulation<dim>* get_triangulation();

diff --git a/main/main.cc b/main/main.cc
@@ -114,7 +114,7 @@ int main() {
 // 3d mushroom //
 /*
 	fch::Laplace<3> laplace_solver;
-	laplace_solver.set_applied_efield(2.3);
+	laplace_solver.set_applied_efield(1.0);
 	laplace_solver.import_mesh_from_file(res_path+"/3d_meshes/mushroom_vacuum.msh");
 	laplace_solver.output_mesh("output/mushroom_vacuum.msh");
 	laplace_solver.setup_system();
@@ -132,13 +132,13 @@ int main() {
 // 2d case usage //
 /*
 	fch::Laplace<2> laplace;
-	laplace.import_mesh_from_file("../res/2d_meshes/vacuum_aligned_dense.msh");
+	laplace.import_mesh_from_file("../res/2d_meshes/vacuum_aligned.msh");
 	laplace.output_mesh("output/vacuum_mesh_2d.vtk");
 	laplace.set_applied_efield(12.0);
 	laplace.run();
 
 	fch::CurrentsAndHeating<2> ch(&pq, &laplace);
-	ch.import_mesh_from_file("../res/2d_meshes/copper_aligned_dense.msh");
+	ch.import_mesh_from_file("../res/2d_meshes/copper_aligned.msh");
 	ch.output_mesh("output/copper_mesh_2d.vtk");
 	ch.run();
 */