fixed bug in SBGATPolyhedronGravityModel.cpp impacting km-based shapes

README.md

@@ -85,6 +85,10 @@ to apply the update (if any).
 - The `Set Shape Mapper` option was renamed to `Set Results Overlay`
 - Several GUI minors bug fixes
 
+### Bug fixes:
+- Fixed bug in `SbgatCore` that was due to an unecessary rescaling of the computed potentials and accelerations within `SbgatCore::ComputeSurfacePGM`. This bug was manifesting itself when calling `SbgatCore::ComputeSurfacePGM` with a shape model whose coordinates were expressed in kilometers. This bug was not affecting `SbgatGui` since it automatically rescales input shapes to meters upon loading.
+
+
 ### [SBGAT 1.12.2](https://github.com/bbercovici/SBGAT/releases/tag/1.12.2)
 
 ### New:

SbgatCore/include/SbgatCore/SBGATPolyhedronGravityModel.hpp

@@ -91,7 +91,6 @@ class VTKFILTERSCORE_EXPORT SBGATPolyhedronGravityModel : public vtkPolyDataAlgo
   void GetPotentialAcceleration(double const * point,double & potential, 
     arma::vec::fixed<3> & acc) const;
 
-
   /**
   Evaluates the Polyhedron Gravity Model potential and acceleration at the specified point assuming 
   a constant density
@@ -104,8 +103,6 @@ class VTKFILTERSCORE_EXPORT SBGATPolyhedronGravityModel : public vtkPolyDataAlgo
     arma::vec::fixed<3> & acc) const;
 
 
-
-
 /**
 Evaluates the Polyhedron Gravity Model potential, acceleration and gravity gradient matrix at the specified point assuming 
 a constant density
@@ -119,7 +116,6 @@ the polydata used to construct the PGM
     arma::vec::fixed<3> & acc,arma::mat::fixed<3,3> & gravity_gradient_mat) const ;
 
 
-
 /**
 Evaluates the Polyhedron Gravity Model potential, acceleration and gravity gradient matrix at the specified point assuming 
 a constant density

SbgatCore/source/SBGATPolyhedronGravityModel.cpp

@@ -889,7 +889,6 @@ void SBGATPolyhedronGravityModel::ComputeSurfacePGM(
 	vtkSmartPointer<SBGATPolyhedronGravityModel> pgm_filter = vtkSmartPointer<SBGATPolyhedronGravityModel>::New();
 	pgm_filter -> SetInputData(selected_shape);
 	pgm_filter -> SetDensity(density);
-	double scale_factor;
 
 	slopes.clear();
 	inertial_potentials.clear();
@@ -909,12 +908,9 @@ void SBGATPolyhedronGravityModel::ComputeSurfacePGM(
 
 	if (is_in_meters){
 		pgm_filter -> SetScaleMeters();
-		scale_factor = 1 ;
 	}
 	else{
 		pgm_filter -> SetScaleKiloMeters();
-		scale_factor = 1000;
-
 	}
 
 	pgm_filter -> Update();
@@ -952,11 +948,6 @@ void SBGATPolyhedronGravityModel::ComputeSurfacePGM(
 		pgm_filter -> GetPotentialAcceleration(facet_center,potential,acc);
 		acc_body_fixed = acc - arma::cross(omega,arma::cross(omega,facet_center));
 
-		// Scaling
-		acc_body_fixed /= scale_factor;
-		acc /= scale_factor;
-		potential /= std::pow(scale_factor,2);
-
 		slope = std::acos(arma::dot(-arma::normalise(acc_body_fixed),normal)) * 180./arma::datum::pi;
 
 		slopes[cellId] = slope;
@@ -969,8 +960,6 @@ void SBGATPolyhedronGravityModel::ComputeSurfacePGM(
 
 }
 
-
-
 void SBGATPolyhedronGravityModel::SaveSurfacePGM(vtkSmartPointer<vtkPolyData> selected_shape,
 	const std::vector<unsigned int> & queried_elements,
 	bool is_in_meters,
@@ -1166,7 +1155,6 @@ void SBGATPolyhedronGravityModel::LoadSurfacePGM(double & mass,
 
 	std::cout << "Done with slopes_json\n ";
 
-
 	nlohmann::json inertial_potentials_json;
 	try{
 		inertial_potentials_json = surface_pgm_json.at("inertial_potentials");

SbgatGui/source/Mainwindow.cpp

@@ -330,7 +330,6 @@ void Mainwindow::createActions() {
     connect(this -> open_select_mapper_window_action, &QAction::triggered, this, &Mainwindow::open_select_mapper_window);
 
 
-
 }
 
 

Tests/source/Tests.cpp

@@ -200,7 +200,8 @@ void TestsSBCore::test_sbgat_pgm_speed(){
 	std::cout << "-- Done computing pgm accelerations in " << elapsed_seconds.count() << " s\n";
 
 
-
+	// The surface acceleration are re-calculated, this time using the static method SBGATPolyhedronGravityModel::ComputeSurfacePGM
+	// that will also evaluate the inertial potential and geopotential in the process
 	std::vector<unsigned int> queried_elements;
 	for (int i = 0; i < polydata -> GetNumberOfCells(); ++i){
 		queried_elements.push_back(i);
@@ -403,7 +404,6 @@ void TestsSBCore::test_spherical_harmonics_coefs_consistency() {
 	spherical_harmonics -> Update();
 
 
-
 	// The spherical harmonics are saved to a file
 	spherical_harmonics -> SaveToJson("../gravity_output/harmo.json");