Removed initialization and finalization of derivative calculations in…

… KSTrajInterpolatorHermite.cxx pending more testing.
project8 · Dec 27, 2016 · 9e0c131 · 9e0c131
1 parent 7e0a0ca
commit 9e0c131
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/Kassiopeia/Trajectories/Include/KSTrajInterpolatorHermite.h b/Kassiopeia/Trajectories/Include/KSTrajInterpolatorHermite.h
@@ -26,6 +26,14 @@ namespace Kassiopeia
             virtual ~KSTrajInterpolatorHermite();
 
         public:
+            void GetInterpolate(double aTime,
+                    const KSTrajAdiabaticIntegrator& anIntegrator,
+                    const KSTrajAdiabaticDifferentiator& aDifferentiator,
+                    const KSTrajAdiabaticParticle& anInitialParticle,
+                    const KSTrajAdiabaticParticle& aFinalParticle,
+                    const double& aTimeStep,
+                    KSTrajAdiabaticParticle& anIntermediateParticle ) const;
+
 
             virtual void Interpolate(double aTime, const KSTrajExactIntegrator& anIntegrator, const KSTrajExactDifferentiator& aDifferentiator, const KSTrajExactParticle& anInitialParticle, const KSTrajExactParticle& aFinalParticle, const double& aTimeStep, KSTrajExactParticle& anIntermediateParticle ) const;
 

diff --git a/Kassiopeia/Trajectories/Source/KSTrajInterpolatorHermite.cxx b/Kassiopeia/Trajectories/Source/KSTrajInterpolatorHermite.cxx
@@ -88,6 +88,23 @@ namespace Kassiopeia
         }
     }
 
+    void KSTrajInterpolatorHermite::GetInterpolate(double aTime,
+            const KSTrajAdiabaticIntegrator& anIntegrator,
+            const KSTrajAdiabaticDifferentiator& aDifferentiator,
+            const KSTrajAdiabaticParticle& anInitialParticle,
+            const KSTrajAdiabaticParticle& aFinalParticle,
+            const double& aTimeStep,
+            KSTrajAdiabaticParticle& anIntermediateParticle ) const
+    {
+// This is a routine to call the interpolater from a step modifier for Project 8.
+
+
+    	KSTrajInterpolatorHermite::Interpolate(aTime, anIntegrator, aDifferentiator, anInitialParticle, aFinalParticle, aTimeStep, anIntermediateParticle);
+
+    }
+
+
+
     void KSTrajInterpolatorHermite::Interpolate(double aTime,
                                                 const KSTrajAdiabaticIntegrator& anIntegrator,
                                                 const KSTrajAdiabaticDifferentiator& aDifferentiator,
@@ -132,9 +149,14 @@ namespace Kassiopeia
                 CubicHermite(tFraction, h30, h31, h32, h33);
 
                 //retrieve the first derivative evaluation from the integrator
+
                 KSTrajAdiabaticDerivative initialDerivative;
                 initialDerivative = 0.0;
-                bool isValid = anIntegrator.GetInitialDerivative(initialDerivative);
+//                bool isValid = anIntegrator.GetInitialDerivative(initialDerivative);
+
+            	bool isValid = true;  // Project 8 edit
+
+
                 if(!isValid)
                 {
                     aDifferentiator.Differentiate(anInitialParticle.GetTime(), anInitialParticle, initialDerivative);
@@ -143,7 +165,8 @@ namespace Kassiopeia
                 //retrieve the final derivative evaluation from the integrator
                 KSTrajAdiabaticDerivative finalDerivative;
                 finalDerivative = 0.0;
-                isValid = anIntegrator.GetFinalDerivative(finalDerivative);
+//                isValid = anIntegrator.GetFinalDerivative(finalDerivative);
+                isValid = true;  // Project 8 edit
                 if(!isValid)
                 {
                     aDifferentiator.Differentiate(aFinalParticle.GetTime(), aFinalParticle, finalDerivative);
@@ -154,6 +177,7 @@ namespace Kassiopeia
                 anIntermediateParticle[0] = tInterpolatedTime; //explicitly set the time variable
             }
 
+
             //interpolate alpha and beta linearly
             //(leaving this unchanged from fast interpolator, may need to improve this)
     		KThreeVector tInitialAlpha = anInitialParticle.GetAlpha().Unit();

diff --git a/Kassiopeia/Trajectories/Source/KSTrajTrajectoryAdiabatic.cxx b/Kassiopeia/Trajectories/Source/KSTrajTrajectoryAdiabatic.cxx
@@ -52,6 +52,8 @@ namespace Kassiopeia
     {
     }
 
+
+
     void KSTrajTrajectoryAdiabatic::SetIntegrator( KSTrajAdiabaticIntegrator* anIntegrator )
     {
         if( fIntegrator == NULL )
@@ -62,6 +64,7 @@ namespace Kassiopeia
         trajmsg( eError ) << "cannot set integrator in <" << this->GetName() << "> with <" << anIntegrator << ">" << eom;
         return;
     }
+
     void KSTrajTrajectoryAdiabatic::ClearIntegrator( KSTrajAdiabaticIntegrator* anIntegrator )
     {
         if( fIntegrator == anIntegrator )