Commit 72abb45e authored by Philipp Schäfer's avatar Philipp Schäfer
Browse files

ART - Conversion to PropagationPath

- renamed namespace from Export to Utils
parent f4a2f551
......@@ -36,7 +36,7 @@ namespace ITAPropagationPathSim
{
namespace AtmosphericRayTracing
{
namespace Export
namespace Utils
{
ITAGeo::CPropagationPath ToPropagationPath(const CRay& ray)
{
......
# $Id:$
set( RelativeDir "include/ITAPropagationPathSim/AtmosphericRayTracing/Export" )
set( RelativeSourceGroup "Header Files\\ITAPropagationPathSim\\AtmosphericRayTracing\\Export" )
set( RelativeDir "include/ITAPropagationPathSim/AtmosphericRayTracing/Utils" )
set( RelativeSourceGroup "Header Files\\ITAPropagationPathSim\\AtmosphericRayTracing\\Utils" )
set( DirFiles
ITAGeo.h
RayToPropagationPath.h
)
set( DirFiles_SourceGroup "${RelativeSourceGroup}" )
......
......@@ -3,7 +3,7 @@
set( RelativeDir "include/ITAPropagationPathSim/AtmosphericRayTracing" )
set( RelativeSourceGroup "Header Files\\ITAPropagationPathSim\\AtmosphericRayTracing" )
set( SubDirs ODESolver Simulation Export EigenraySearch)
set( SubDirs ODESolver Simulation EigenraySearch Utils)
set( DirFiles
Rays.h
......
......@@ -25,7 +25,7 @@
#include <ITAPropagationPathSim/AtmosphericRayTracing/ODESolver/ODESolver.h>
#include <ITAPropagationPathSim/AtmosphericRayTracing/Rays.h>
#include <ITAPropagationPathSim/AtmosphericRayTracing/Export/ITAGeo.h>
#include <ITAPropagationPathSim/AtmosphericRayTracing/Utils/RayToPropagationPath.h>
#include <ITAGeo/Base.h>
//#include <cassert>
......@@ -36,6 +36,7 @@
using namespace std;
using namespace ITAGeo;
using namespace ITAPropagationPathSim::AtmosphericRayTracing;
using namespace ITAPropagationPathSim::AtmosphericRayTracing::Utils;
void runTest(const CStratifiedAtmosphere& atmosphere, const string& fileSuffix)
......@@ -71,8 +72,8 @@ void runTest(const CStratifiedAtmosphere& atmosphere, const string& fileSuffix)
}
cout << "Starting export..." << endl;
Export::ToPropagationPath(rayEuler).Store("ODESolverTest_Euler_" + fileSuffix + ".json");
Export::ToPropagationPath(rayRunge).Store("ODESolverTest_RungeKutta_" + fileSuffix + ".json");
ToPropagationPath(rayEuler).Store("ODESolverTest_Euler_" + fileSuffix + ".json");
ToPropagationPath(rayRunge).Store("ODESolverTest_RungeKutta_" + fileSuffix + ".json");
cout << "Finished" << endl << endl;
}
......
......@@ -26,7 +26,7 @@
#include <ITAPropagationPathSim/AtmosphericRayTracing/ODESolver/ODESolver.h>
#include <ITAPropagationPathSim/AtmosphericRayTracing/Rays.h>
#include <ITAPropagationPathSim/AtmosphericRayTracing/Export/ITAGeo.h>
#include <ITAPropagationPathSim/AtmosphericRayTracing/Utils/RayToPropagationPath.h>
#include <ITAGeo/Base.h>
//#include <cassert>
......@@ -39,6 +39,7 @@ using namespace std;
using namespace ITAGeo;
using namespace ITAPropagationPathSim::AtmosphericRayTracing;
using namespace ITAPropagationPathSim::AtmosphericRayTracing::Simulation;
using namespace ITAPropagationPathSim::AtmosphericRayTracing::Utils;
void runTest(const CStratifiedAtmosphere& atmosphere, const double& sourceAltitude, const VistaVector3D& rayDirection, const string& fileSuffix)
{
......@@ -65,8 +66,8 @@ void runTest(const CStratifiedAtmosphere& atmosphere, const double& sourceAltitu
std::vector<std::shared_ptr<CRay>> resultRunge = engine.Run(atmosphere, sourcePosition, { rayDirection });
cout << "Starting export..." << endl;
Export::ToPropagationPath(*resultEuler[0]).Store("SimulationEngineTest_Euler_" + fileSuffix + ".json");
Export::ToPropagationPath(*resultRunge[0]).Store("SimulationEngineTest_RungeKutta_" + fileSuffix + ".json");
ToPropagationPath(*resultEuler[0]).Store("SimulationEngineTest_Euler_" + fileSuffix + ".json");
ToPropagationPath(*resultRunge[0]).Store("SimulationEngineTest_RungeKutta_" + fileSuffix + ".json");
cout << "Finished" << endl << endl;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment