Skip to content

Commit

Permalink
Removed extern templates
Browse files Browse the repository at this point in the history
  • Loading branch information
DominicDirkx committed Nov 13, 2024
1 parent 6e968cd commit 91bcb9b
Show file tree
Hide file tree
Showing 85 changed files with 230 additions and 230 deletions.
2 changes: 1 addition & 1 deletion include/tudat/astro/basic_astro/accelerationModel.h
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ typedef AccelerationModel< Eigen::Vector2d > AccelerationModel2d;
//! Typedef for shared-pointer to a 2D acceleration model.
typedef std::shared_ptr< AccelerationModel2d > AccelerationModel2dPointer;

extern template class AccelerationModel< Eigen::Vector3d >;
//extern template class AccelerationModel< Eigen::Vector3d >;


//! Update the members of an acceleration model and evaluate the acceleration.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ std::shared_ptr< RotationalEphemeris > getTabulatedRotationalEphemeris(

}

extern template class TabulatedRotationalEphemeris< double, double >;
//extern template class TabulatedRotationalEphemeris< double, double >;


bool isTabulatedRotationalEphemeris( const std::shared_ptr< RotationalEphemeris > rotationalEphemeris );
Expand Down
2 changes: 1 addition & 1 deletion include/tudat/astro/gravitation/centralGravityModel.h
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ double computeGravitationalPotential(

//! Template class for central gravitational acceleration model.
/*!
* This template class implements a central gravitational acceleration model, i.e., only the
* This //template class implements a central gravitational acceleration model, i.e., only the
* central term of the general spherical harmonics expansion.
* \tparam StateMatrix Data type for state matrix (default = Eigen::Vector3d).
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace gravitation

//! Template base class for spherical harmonics gravitational acceleration models.
/*!
* This template class serves as the base class for the
* This //template class serves as the base class for the
* SphericalHarmonicsGravitationalAccelerationModel, CentralGravitationalAccelerationModel,
* CentralJ2GravitationalAccelerationModel, CentralJ2J3GravitationalAccelerationModel, and
* CentralJ2J3J4GravitationalAccelerationModel classes.
Expand Down
12 changes: 6 additions & 6 deletions include/tudat/astro/observation_models/observationManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -477,12 +477,12 @@ class ObservationManager: public ObservationManagerBase< ObservationScalarType,

};


extern template class ObservationManagerBase< double, double >;
extern template class ObservationManager< 1, double, double >;
extern template class ObservationManager< 2, double, double >;
extern template class ObservationManager< 3, double, double >;
extern template class ObservationManager< 6, double, double >;
//
//extern template class ObservationManagerBase< double, double >;
//extern template class ObservationManager< 1, double, double >;
//extern template class ObservationManager< 2, double, double >;
//extern template class ObservationManager< 3, double, double >;
//extern template class ObservationManager< 6, double, double >;

}

Expand Down
10 changes: 5 additions & 5 deletions include/tudat/astro/observation_models/observationModel.h
Original file line number Diff line number Diff line change
Expand Up @@ -634,11 +634,11 @@ class ObservationModel
//! Pre-define list of states used when calling function returning link-end states/times from interface function.
std::vector< Eigen::Matrix< double, 6, 1 > > linkEndStates_;
};

extern template class ObservationModel< 1, double, double >;
extern template class ObservationModel< 2, double, double >;
extern template class ObservationModel< 3, double, double >;
extern template class ObservationModel< 6, double, double >;
//
//extern template class ObservationModel< 1, double, double >;
//extern template class ObservationModel< 2, double, double >;
//extern template class ObservationModel< 3, double, double >;
//extern template class ObservationModel< 6, double, double >;

//! Function to compute an observation of size 1 at double precision, with double precision input
/*!
Expand Down
10 changes: 5 additions & 5 deletions include/tudat/astro/orbit_determination/podInputOutputTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -1144,11 +1144,11 @@ struct EstimationOutput: public CovarianceAnalysisOutput< ObservationScalarType,

};

extern template class CovarianceAnalysisInput< double, double >;
extern template struct CovarianceAnalysisOutput< double >;

extern template class EstimationInput< double, double >;
extern template struct EstimationOutput< double >;
//extern template class CovarianceAnalysisInput< double, double >;
//extern template struct CovarianceAnalysisOutput< double >;
//
//extern template class EstimationInput< double, double >;
//extern template struct EstimationOutput< double >;

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ class DynamicsStateDerivativeModel
std::map< TimeType, unsigned int > cumulativeFunctionEvaluationCounter_;
};

extern template class DynamicsStateDerivativeModel< double, double >;
//extern template class DynamicsStateDerivativeModel< double, double >;

inline std::vector< std::shared_ptr< basic_astrodynamics::AccelerationModel3d > > getAccelerationBetweenBodies(
const std::string bodyUndergoingAcceleration,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class NBodyCowellStateDerivative: public NBodyStateDerivative< StateScalarType,

};

extern template class NBodyCowellStateDerivative< double, double >;
//extern template class NBodyCowellStateDerivative< double, double >;

} // namespace propagators

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ class NBodyEnckeStateDerivative: public NBodyStateDerivative< StateScalarType, T

};

extern template class NBodyEnckeStateDerivative< double, double >;
//extern template class NBodyEnckeStateDerivative< double, double >;


} // namespace propagators
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ class NBodyGaussKeplerStateDerivative: public NBodyStateDerivative< StateScalarT

};

extern template class NBodyGaussKeplerStateDerivative< double, double >;
//extern template class NBodyGaussKeplerStateDerivative< double, double >;

} // namespace propagators

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ class NBodyGaussModifiedEquinictialStateDerivative: public NBodyStateDerivative<

};

extern template class NBodyGaussModifiedEquinictialStateDerivative< double, double >;
//extern template class NBodyGaussModifiedEquinictialStateDerivative< double, double >;

} // namespace propagators

Expand Down
2 changes: 1 addition & 1 deletion include/tudat/astro/propagators/nBodyStateDerivative.h
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ class NBodyStateDerivative: public propagators::SingleStateTypeDerivative< State

};

extern template class NBodyStateDerivative< double, double >;
//extern template class NBodyStateDerivative< double, double >;

} // namespace propagators

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ class NBodyUnifiedStateModelExponentialMapStateDerivative: public NBodyStateDeri

};

extern template class NBodyUnifiedStateModelExponentialMapStateDerivative< double, double >;
//extern template class NBodyUnifiedStateModelExponentialMapStateDerivative< double, double >;

} // namespace propagators

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ class NBodyUnifiedStateModelModifiedRodriguesParametersStateDerivative: public N

};

extern template class NBodyUnifiedStateModelModifiedRodriguesParametersStateDerivative< double, double >;
//extern template class NBodyUnifiedStateModelModifiedRodriguesParametersStateDerivative< double, double >;

} // namespace propagators

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ class NBodyUnifiedStateModelQuaternionsStateDerivative: public NBodyStateDerivat
};


extern template class NBodyUnifiedStateModelQuaternionsStateDerivative< double, double >;
//extern template class NBodyUnifiedStateModelQuaternionsStateDerivative< double, double >;



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ class RotationalMotionExponentialMapStateDerivative: public RotationalMotionStat

};

extern template class RotationalMotionExponentialMapStateDerivative< double, double >;
//extern template class RotationalMotionExponentialMapStateDerivative< double, double >;

} // namespace propagators

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ class RotationalMotionModifiedRodriguesParametersStateDerivative: public Rotatio

};

extern template class RotationalMotionModifiedRodriguesParametersStateDerivative< double, double >;
//extern template class RotationalMotionModifiedRodriguesParametersStateDerivative< double, double >;

} // namespace propagators

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ class RotationalMotionQuaternionsStateDerivative: public RotationalMotionStateDe
};


extern template class RotationalMotionQuaternionsStateDerivative< double, double >;
//extern template class RotationalMotionQuaternionsStateDerivative< double, double >;

} // namespace propagators

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ class RotationalMotionStateDerivative: public propagators::SingleStateTypeDeriva
};


extern template class RotationalMotionStateDerivative< double, double >;
//extern template class RotationalMotionStateDerivative< double, double >;


} // namespace propagators
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ class SingleStateTypeDerivative
Eigen::Matrix< StateScalarType, Eigen::Dynamic, 1 > unprocessedState_;
};

extern template class SingleStateTypeDerivative< double, double >;
//extern template class SingleStateTypeDerivative< double, double >;


} // namespace propagators
Expand Down
2 changes: 1 addition & 1 deletion include/tudat/interface/json/jsonEstimationInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ class JsonEstimationManager: public JsonVariationalEquationsSimulationManager< T

};

extern template class JsonEstimationManager< double, double >;
//extern template class JsonEstimationManager< double, double >;

//#if( BUILD_EXTENDED_PRECISION_PROPAGATION_TOOLS )
//extern template class JsonEstimationManager< Time, long double >;
Expand Down
2 changes: 1 addition & 1 deletion include/tudat/interface/json/jsonInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ class JsonSimulationManager

};

extern template class JsonSimulationManager< double, double >;
//extern template class JsonSimulationManager< double, double >;

//! Function to create a `json` object from a Simulation object.
template< typename TimeType, typename StateScalarType >
Expand Down
2 changes: 1 addition & 1 deletion include/tudat/interface/json/jsonInterfaceVariational.h
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ class JsonVariationalEquationsSimulationManager: public JsonSimulationManager< T

};

extern template class JsonVariationalEquationsSimulationManager< double, double >;
//extern template class JsonVariationalEquationsSimulationManager< double, double >;


} // namespace json_interface
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1052,9 +1052,9 @@ class AdamsBashforthMoultonIntegrator
StateDerivativeType lastDerivative_;
};

extern template class AdamsBashforthMoultonIntegrator < double, Eigen::VectorXd, Eigen::VectorXd >;
extern template class AdamsBashforthMoultonIntegrator < double, Eigen::Vector6d, Eigen::Vector6d >;
extern template class AdamsBashforthMoultonIntegrator < double, Eigen::MatrixXd, Eigen::MatrixXd >;
//extern template class AdamsBashforthMoultonIntegrator < double, Eigen::VectorXd, Eigen::VectorXd >;
//extern template class AdamsBashforthMoultonIntegrator < double, Eigen::Vector6d, Eigen::Vector6d >;
//extern template class AdamsBashforthMoultonIntegrator < double, Eigen::MatrixXd, Eigen::MatrixXd >;


//! Typedef of Adam-Bashforh-Moulton integrator (state/state derivative = VectorXd, independent variable = double).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -517,9 +517,9 @@ class BulirschStoerVariableStepSizeIntegrator :

};

extern template class BulirschStoerVariableStepSizeIntegrator < double, Eigen::VectorXd, Eigen::VectorXd >;
extern template class BulirschStoerVariableStepSizeIntegrator < double, Eigen::Vector6d, Eigen::Vector6d >;
extern template class BulirschStoerVariableStepSizeIntegrator < double, Eigen::MatrixXd, Eigen::MatrixXd >;
//extern template class BulirschStoerVariableStepSizeIntegrator < double, Eigen::VectorXd, Eigen::VectorXd >;
//extern template class BulirschStoerVariableStepSizeIntegrator < double, Eigen::Vector6d, Eigen::Vector6d >;
//extern template class BulirschStoerVariableStepSizeIntegrator < double, Eigen::MatrixXd, Eigen::MatrixXd >;


// Typedef of variable-step size Bulirsch-Stoer integrator (state/state derivative = VectorXd,
Expand Down
6 changes: 3 additions & 3 deletions include/tudat/math/integrators/numericalIntegrator.h
Original file line number Diff line number Diff line change
Expand Up @@ -260,9 +260,9 @@ class NumericalIntegrator
};


extern template class NumericalIntegrator < double, Eigen::VectorXd, Eigen::VectorXd >;
extern template class NumericalIntegrator < double, Eigen::Vector6d, Eigen::Vector6d >;
extern template class NumericalIntegrator < double, Eigen::MatrixXd, Eigen::MatrixXd >;
//extern template class NumericalIntegrator < double, Eigen::VectorXd, Eigen::VectorXd >;
//extern template class NumericalIntegrator < double, Eigen::Vector6d, Eigen::Vector6d >;
//extern template class NumericalIntegrator < double, Eigen::MatrixXd, Eigen::MatrixXd >;

//! Perform an integration to a specified independent variable value.
template< typename IndependentVariableType, typename StateType, typename StateDerivativeType, typename TimeStepType >
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ class ReinitializableNumericalIntegrator :

};

extern template class ReinitializableNumericalIntegrator < double, Eigen::VectorXd, Eigen::VectorXd >;
extern template class ReinitializableNumericalIntegrator < double, Eigen::Vector6d, Eigen::Vector6d >;
extern template class ReinitializableNumericalIntegrator < double, Eigen::MatrixXd, Eigen::MatrixXd >;
//extern template class ReinitializableNumericalIntegrator < double, Eigen::VectorXd, Eigen::VectorXd >;
//extern template class ReinitializableNumericalIntegrator < double, Eigen::Vector6d, Eigen::Vector6d >;
//extern template class ReinitializableNumericalIntegrator < double, Eigen::MatrixXd, Eigen::MatrixXd >;

//! Typedef for shared-pointer to default, re-initializable numerical integrator.
/*!
Expand Down
6 changes: 3 additions & 3 deletions include/tudat/math/integrators/rungeKutta4Integrator.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ class RungeKutta4Integrator

};

extern template class RungeKutta4Integrator < double, Eigen::VectorXd, Eigen::VectorXd >;
extern template class RungeKutta4Integrator < double, Eigen::Vector6d, Eigen::Vector6d >;
extern template class RungeKutta4Integrator < double, Eigen::MatrixXd, Eigen::MatrixXd >;
//extern template class RungeKutta4Integrator < double, Eigen::VectorXd, Eigen::VectorXd >;
//extern template class RungeKutta4Integrator < double, Eigen::Vector6d, Eigen::Vector6d >;
//extern template class RungeKutta4Integrator < double, Eigen::MatrixXd, Eigen::MatrixXd >;


//! Typedef of RK4 integrator (state/state derivative = VectorXd, independent variable = double).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -356,9 +356,9 @@ class RungeKuttaFixedStepSizeIntegrator
RungeKuttaCoefficients::OrderEstimateToIntegrate orderToUse_;
};

extern template class RungeKuttaFixedStepSizeIntegrator < double, Eigen::VectorXd, Eigen::VectorXd >;
extern template class RungeKuttaFixedStepSizeIntegrator < double, Eigen::Vector6d, Eigen::Vector6d >;
extern template class RungeKuttaFixedStepSizeIntegrator < double, Eigen::MatrixXd, Eigen::MatrixXd >;
//extern template class RungeKuttaFixedStepSizeIntegrator < double, Eigen::VectorXd, Eigen::VectorXd >;
//extern template class RungeKuttaFixedStepSizeIntegrator < double, Eigen::Vector6d, Eigen::Vector6d >;
//extern template class RungeKuttaFixedStepSizeIntegrator < double, Eigen::MatrixXd, Eigen::MatrixXd >;


//! Typedef of RK fixed-step integrator (state/state derivative = VectorXd, independent variable = double).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -491,9 +491,9 @@ class RungeKuttaVariableStepSizeIntegrator :

};

extern template class RungeKuttaVariableStepSizeIntegrator < double, Eigen::VectorXd, Eigen::VectorXd >;
extern template class RungeKuttaVariableStepSizeIntegrator < double, Eigen::Vector6d, Eigen::Vector6d >;
extern template class RungeKuttaVariableStepSizeIntegrator < double, Eigen::MatrixXd, Eigen::MatrixXd >;
//extern template class RungeKuttaVariableStepSizeIntegrator < double, Eigen::VectorXd, Eigen::VectorXd >;
//extern template class RungeKuttaVariableStepSizeIntegrator < double, Eigen::Vector6d, Eigen::Vector6d >;
//extern template class RungeKuttaVariableStepSizeIntegrator < double, Eigen::MatrixXd, Eigen::MatrixXd >;


//! Perform a single integration step.
Expand Down
6 changes: 3 additions & 3 deletions include/tudat/math/interpolators/cubicSplineInterpolator.h
Original file line number Diff line number Diff line change
Expand Up @@ -424,9 +424,9 @@ class CubicSplineInterpolator :
};


extern template class CubicSplineInterpolator< double, Eigen::VectorXd >;
extern template class CubicSplineInterpolator< double, Eigen::Vector6d >;
extern template class CubicSplineInterpolator< double, Eigen::MatrixXd >;
//extern template class CubicSplineInterpolator< double, Eigen::VectorXd >;
//extern template class CubicSplineInterpolator< double, Eigen::Vector6d >;
//extern template class CubicSplineInterpolator< double, Eigen::MatrixXd >;

//! Typedef for cubic spline interpolator with (in)dependent = double.
typedef CubicSplineInterpolator< double, double > CubicSplineInterpolatorDouble;
Expand Down
6 changes: 3 additions & 3 deletions include/tudat/math/interpolators/interpolator.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ class Interpolator

};

extern template class Interpolator< double, Eigen::VectorXd >;
extern template class Interpolator< double, Eigen::Vector6d >;
extern template class Interpolator< double, Eigen::MatrixXd >;
//extern template class Interpolator< double, Eigen::VectorXd >;
//extern template class Interpolator< double, Eigen::Vector6d >;
//extern template class Interpolator< double, Eigen::MatrixXd >;

} // namespace interpolators

Expand Down
6 changes: 3 additions & 3 deletions include/tudat/math/interpolators/lagrangeInterpolator.h
Original file line number Diff line number Diff line change
Expand Up @@ -523,9 +523,9 @@ class LagrangeInterpolator : public OneDimensionalInterpolator< IndependentVaria

};

extern template class LagrangeInterpolator< double, Eigen::VectorXd >;
extern template class LagrangeInterpolator< double, Eigen::Vector6d >;
extern template class LagrangeInterpolator< double, Eigen::MatrixXd >;
//extern template class LagrangeInterpolator< double, Eigen::VectorXd >;
//extern template class LagrangeInterpolator< double, Eigen::Vector6d >;
//extern template class LagrangeInterpolator< double, Eigen::MatrixXd >;

//! Typedef for LagrangeInterpolator with double as both its dependent and independent data type.
typedef LagrangeInterpolator< double, double > LagrangeInterpolatorDouble;
Expand Down
6 changes: 3 additions & 3 deletions include/tudat/math/interpolators/linearInterpolator.h
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,9 @@ class LinearInterpolator
};


extern template class LinearInterpolator< double, Eigen::VectorXd >;
extern template class LinearInterpolator< double, Eigen::Vector6d >;
extern template class LinearInterpolator< double, Eigen::MatrixXd >;
//extern template class LinearInterpolator< double, Eigen::VectorXd >;
//extern template class LinearInterpolator< double, Eigen::Vector6d >;
//extern template class LinearInterpolator< double, Eigen::MatrixXd >;


//! Typedef for linear interpolator with (in)dependent variable = double.
Expand Down
Loading

0 comments on commit 91bcb9b

Please sign in to comment.