Atmospheric Ray Tracing

-moved ODESolver and Simulation content to respective subfolders

include/ITAPropagationPathSim/AtmosphericRayTracing/ODESolver/_SourceFiles.cmake

+# $Id:$
+
+
+set( RelativeDir "include/ITAPropagationPathSim/AtmosphericRayTracing/ODESolver" )
+set( RelativeSourceGroup "Header Files\\ITAPropagationPathSim\\AtmosphericRayTracing\\ODESolver" )
+
+set( DirFiles 
+	ODESolver.h
+	)
+		
+set( DirFiles_SourceGroup "${RelativeSourceGroup}" )
+
+set( LocalSourceGroupFiles  )
+foreach( File ${DirFiles} )
+	list( APPEND LocalSourceGroupFiles "${RelativeDir}/${File}" )
+	list( APPEND ProjectSources "${RelativeDir}/${File}" )
+endforeach()
+source_group( ${DirFiles_SourceGroup} FILES ${LocalSourceGroupFiles} )

include/ITAPropagationPathSim/AtmosphericRayTracing/SimulationEngine.h → include/ITAPropagationPathSim/AtmosphericRayTracing/Simulation/Engine.h

@@ -25,7 +25,7 @@
 #include <VistaBase/VistaVector3D.h>
 
 // ITA includes
-#include <ITAPropagationPathSim/AtmosphericRayTracing/ODESolver.h>
+#include <ITAPropagationPathSim/AtmosphericRayTracing/ODESolver/ODESolver.h>
 #include <ITAPropagationPathSim/AtmosphericRayTracing/Rays.h>
 #include <ITAGeo/Atmosphere/StratifiedAtmosphere.h>
 

include/ITAPropagationPathSim/AtmosphericRayTracing/Simulation/_SourceFiles.cmake

+# $Id:$
+
+
+set( RelativeDir "include/ITAPropagationPathSim/AtmosphericRayTracing/Simulation" )
+set( RelativeSourceGroup "Header Files\\ITAPropagationPathSim\\AtmosphericRayTracing\\Simulation" )
+
+set( DirFiles 
+	Engine.h
+	)
+		
+set( DirFiles_SourceGroup "${RelativeSourceGroup}" )
+
+set( LocalSourceGroupFiles  )
+foreach( File ${DirFiles} )
+	list( APPEND LocalSourceGroupFiles "${RelativeDir}/${File}" )
+	list( APPEND ProjectSources "${RelativeDir}/${File}" )
+endforeach()
+source_group( ${DirFiles_SourceGroup} FILES ${LocalSourceGroupFiles} )
\ No newline at end of file

include/ITAPropagationPathSim/AtmosphericRayTracing/_SourceFiles.cmake

@@ -3,10 +3,9 @@
 
 set( RelativeDir "include/ITAPropagationPathSim/AtmosphericRayTracing" )
 set( RelativeSourceGroup "Header Files\\ITAPropagationPathSim\\AtmosphericRayTracing" )
+set( SubDirs ODESolver Simulation)
 
 set( DirFiles 
-	ODESolver.h
-	SimulationEngine.h
 	Rays.h
 	)
 		
@@ -19,4 +18,11 @@ foreach( File ${DirFiles} )
 endforeach()
 source_group( ${DirFiles_SourceGroup} FILES ${LocalSourceGroupFiles} )
 
+set( SubDirFiles "" )
+foreach( Dir ${SubDirs} )
+	list( APPEND SubDirFiles "${RelativeDir}/${Dir}/_SourceFiles.cmake" )
+endforeach()
 
+foreach( SubDirFile ${SubDirFiles} )
+	include( ${SubDirFile} )
+endforeach()
\ No newline at end of file

src/ITAPropagationPathSim/AtmosphericRayTracing/ODESolver.cpp → src/ITAPropagationPathSim/AtmosphericRayTracing/ODESolver/ODESolver.cpp

-#include <ITAPropagationPathSim/AtmosphericRayTracing/ODESolver.h>
+#include <ITAPropagationPathSim/AtmosphericRayTracing/ODESolver/ODESolver.h>
 
 #include <cmath>
 

src/ITAPropagationPathSim/AtmosphericRayTracing/ODESolver/_SourceFiles.cmake

+# $Id:$
+
+
+set( RelativeDir "src/ITAPropagationPathSim/AtmosphericRayTracing/ODESolver" )
+set( RelativeSourceGroup "Source Files\\ITAPropagationPathSim\\AtmosphericRayTracing\\ODESolver" )
+
+set( DirFiles 
+	ODESolver.cpp
+	)
+		
+set( DirFiles_SourceGroup "${RelativeSourceGroup}" )
+
+set( LocalSourceGroupFiles  )
+foreach( File ${DirFiles} )
+	list( APPEND LocalSourceGroupFiles "${RelativeDir}/${File}" )
+	list( APPEND ProjectSources "${RelativeDir}/${File}" )
+endforeach()
+source_group( ${DirFiles_SourceGroup} FILES ${LocalSourceGroupFiles} )
+
+

src/ITAPropagationPathSim/AtmosphericRayTracing/SimulationEngine.cpp → src/ITAPropagationPathSim/AtmosphericRayTracing/Simulation/Engine.cpp

-#include <ITAPropagationPathSim/AtmosphericRayTracing/SimulationEngine.h>
+#include <ITAPropagationPathSim/AtmosphericRayTracing/Simulation/Engine.h>
 
 // ITA includes
 #include <ITAException.h>
-#include <ITAPropagationPathSim/AtmosphericRayTracing/ODESolver.h>
+#include <ITAPropagationPathSim/AtmosphericRayTracing/ODESolver/ODESolver.h>
 
 // STD
 #include <cmath>
@@ -107,7 +107,7 @@ private:
 	}
 
 public:
-	double GetCurrentTimeStep() const { return dCurrentDt; }
+	double GetCurrentStepSize() const { return dCurrentDt; }
 	void Process(VistaVector3D& r, VistaVector3D& s, const ITAGeo::CStratifiedAtmosphere& atmosphere)
 	{
 		if (rSettings.AdaptiveIntegration.bActive)
@@ -156,7 +156,7 @@ class CEngine::CWorker
 		 {
 			 mIntegrator.Process(r, s, atmosphere);
 			 n = ODESolver::SlownessToNormal(s);
-			 const double dt = mIntegrator.GetCurrentTimeStep();
+			 const double dt = mIntegrator.GetCurrentStepSize();
 
 			 //if (ReflectionOccured(1, 1))
 			 //{

src/ITAPropagationPathSim/AtmosphericRayTracing/Simulation/_SourceFiles.cmake

+# $Id:$
+
+
+set( RelativeDir "src/ITAPropagationPathSim/AtmosphericRayTracing/Simulation" )
+set( RelativeSourceGroup "Source Files\\ITAPropagationPathSim\\AtmosphericRayTracing\\Simulation" )
+
+set( DirFiles 
+	Engine.cpp
+	)
+		
+set( DirFiles_SourceGroup "${RelativeSourceGroup}" )
+
+set( LocalSourceGroupFiles  )
+foreach( File ${DirFiles} )
+	list( APPEND LocalSourceGroupFiles "${RelativeDir}/${File}" )
+	list( APPEND ProjectSources "${RelativeDir}/${File}" )
+endforeach()
+source_group( ${DirFiles_SourceGroup} FILES ${LocalSourceGroupFiles} )
+
+

src/ITAPropagationPathSim/AtmosphericRayTracing/_SourceFiles.cmake

@@ -3,10 +3,9 @@
 
 set( RelativeDir "src/ITAPropagationPathSim/AtmosphericRayTracing" )
 set( RelativeSourceGroup "Source Files\\ITAPropagationPathSim\\AtmosphericRayTracing" )
+set( SubDirs ODESolver Simulation)
 
 set( DirFiles 
-	ODESolver.cpp
-	SimulationEngine.cpp
 	)
 		
 set( DirFiles_SourceGroup "${RelativeSourceGroup}" )
@@ -18,4 +17,11 @@ foreach( File ${DirFiles} )
 endforeach()
 source_group( ${DirFiles_SourceGroup} FILES ${LocalSourceGroupFiles} )
 
+set( SubDirFiles "" )
+foreach( Dir ${SubDirs} )
+	list( APPEND SubDirFiles "${RelativeDir}/${Dir}/_SourceFiles.cmake" )
+endforeach()
 
+foreach( SubDirFile ${SubDirFiles} )
+	include( ${SubDirFile} )
+endforeach()
\ No newline at end of file

tests/AtmosphericRayTracing/ODESolverTest.cpp

@@ -22,7 +22,7 @@
 //#include <ITAStringUtils.h>
 
 #include <ITAGeo/Atmosphere/StratifiedAtmosphere.h>
-#include <ITAPropagationPathSim/AtmosphericRayTracing/ODESolver.h>
+#include <ITAPropagationPathSim/AtmosphericRayTracing/ODESolver/ODESolver.h>
 
 //#include <cassert>