Small updates

include/tudat/astro/electromagnetism/luminosityModel.h

@@ -25,6 +25,8 @@ namespace tudat
 namespace electromagnetism
 {
 
+double computeLuminosityFromIrradiance( const double irradiance, const double distance );
+
 /*!
  * Class modeling the luminosity, or emitted electromagnetic power, of a radiation source.
  *
@@ -81,56 +83,36 @@ class ConstantLuminosityModel : public LuminosityModel
     double luminosity_;
 };
 
-
-/*!
- * Class modeling luminosity of a radiation source based on the irradiance at a given distance.
- *
- * This luminosity is useful to model variations in the Sun luminosity based on the solar irradiance measured
- * at Earth distance.
- *
- * The source is assumed to be isotropic such that the irradiance given would be found at any position with the
- * same distance from the source.
- */
-class IrradianceBasedLuminosityModel : public LuminosityModel
+class VariableLuminosityModel : public LuminosityModel
 {
 public:
     /*!
      * Constructor.
      *
-     * @param irradianceAtDistanceFunction Function returning the irradiance [W/m²] at a given time
-     * @param distance Distance from the source at which the irradiance was evaluated/measured
-     */
-    explicit IrradianceBasedLuminosityModel(
-            const std::function<double(double)>& irradianceAtDistanceFunction,
-            double distance)
-            : irradianceAtDistanceFunction_(irradianceAtDistanceFunction), distance_(distance) {}
-
-    /*!
-     * Constructor.
-     *
-     * @param irradianceAtDistance Irradiance at the given distance [W/m²]
-     * @param distance Distance from the source at which the irradiance was evaluated/measured
+     * @param luminosity Constant luminosity of the source [W]
      */
-    explicit IrradianceBasedLuminosityModel(
-            double irradianceAtDistance,
-            double distance)
-            : IrradianceBasedLuminosityModel([=] (double) { return irradianceAtDistance; }, distance) {}
+    explicit VariableLuminosityModel( const std::function< double( const double ) > luminosityFunction ) :
+        luminosityFunction_( luminosityFunction ), luminosity_( TUDAT_NAN ) {}
 
-    double getLuminosity() const override;
+    double getLuminosity() const override
+    {
+        return luminosity_;
+    }
 
 private:
-    void updateMembers_(double currentTime) override;
 
-    //! Function returning the irradiance [W/m²] at a given time
-    std::function<double(double)> irradianceAtDistanceFunction_;
+    virtual void updateMembers_(const double currentTime)  override
+    {
+        luminosity_ = luminosityFunction_( currentTime );
+    }
 
-    //! Irradiance from the last evaluation of irradianceAtDistanceFunction_ [W/m²]
-    double irradianceAtDistance_{};
+    //! Constant luminosity of the source [W]
+    const std::function< double( const double ) > luminosityFunction_;
 
-    //! Distance from the source at which the irradiance was evaluated/measured
-    double distance_;
+    double luminosity_;
 };
 
+
 } // tudat
 } // electromagnetism
 

include/tudat/astro/electromagnetism/surfacePropertyDistribution.h

@@ -219,8 +219,26 @@ class SecondDegreeZonalPeriodicSurfacePropertyDistribution : public SurfacePrope
     const double angularFrequency;
 };
 
-} // tudat
+class CustomSurfacePropertyDistribution : public SurfacePropertyDistribution
+{
+public:
+    CustomSurfacePropertyDistribution(
+        const std::function< double( const double, const double, const double ) > customFunction ):
+        customFunction_( customFunction ){ }
+
+    double getValue(double latitude, double longitude)
+    {
+        return customFunction_( latitude, longitude, currentTime_ );
+    }
+
+    bool isTimeInvariant( ){ return false; }
+
+private:
+    std::function< double( const double, const double, const double ) > customFunction_;
+};
+
 } // electromagnetism
 
+} // tudat
 
 #endif //TUDAT_SURFACEPROPERTYDISTRIBUTION_H

include/tudat/simulation/environment_setup/createRadiationSourceModel.h

@@ -66,7 +66,7 @@ class RadiationSourceModelSettings
 enum class LuminosityModelType
 {
     constant_radiant_power,
-    irradiance_based_radiant_power
+    time_variable_isotropic_radiant_power
 };
 
 /*!
@@ -117,40 +117,26 @@ class ConstantLuminosityModelSettings : public LuminosityModelSettings
     double luminosity_;
 };
 
-/*!
- * Settings for an irradiance-based luminosity model.
- *
- * @see IrradianceBasedLuminosityModel
- */
-class IrradianceBasedLuminosityModelSettings : public LuminosityModelSettings
+class TimeVariableLuminosityModelSettings : public LuminosityModelSettings
 {
 public:
     /*!
      * Constructor.
      *
-     * @param irradianceAtDistanceFunction Function returning the irradiance at a given time [W/m²]
-     * @param distance Distance from the source at which the irradiance was evaluated/measured
+     * @param luminosity Constant luminosity of the source [W]
      */
-    explicit IrradianceBasedLuminosityModelSettings(
-            const std::function<double(double)>& irradianceAtDistanceFunction,
-            const double distance) :
-            LuminosityModelSettings(LuminosityModelType::irradiance_based_radiant_power),
-            irradianceAtDistanceFunction_(irradianceAtDistanceFunction),
-            distance_(distance) {}
-
-    const std::function<double(double)>& getIrradianceAtDistanceFunction() const
-    {
-        return irradianceAtDistanceFunction_;
-    }
+    explicit TimeVariableLuminosityModelSettings(
+        const std::function< double( const double ) > luminosityFunction) :
+        LuminosityModelSettings(LuminosityModelType::time_variable_isotropic_radiant_power),
+        luminosityFunction_(luminosityFunction) {}
 
-    double getDistance() const
+    std::function< double( const double ) > getLuminosityFuntion() const
     {
-        return distance_;
+        return luminosityFunction_;
     }
 
 private:
-    std::function<double(double)> irradianceAtDistanceFunction_;
-    double distance_;
+    std::function< double( const double ) > luminosityFunction_;
 };
 
 /*!
@@ -200,9 +186,24 @@ inline std::shared_ptr<LuminosityModelSettings>
 inline std::shared_ptr<LuminosityModelSettings>
         irradianceBasedLuminosityModelSettings(double irradianceAtDistance, double distance)
 {
-    return std::make_shared< IrradianceBasedLuminosityModelSettings >(
-            [=] (double) { return irradianceAtDistance; },
-            distance);
+    return std::make_shared< ConstantLuminosityModelSettings >(
+        electromagnetism::computeLuminosityFromIrradiance( irradianceAtDistance, distance ) );
+}
+
+inline std::shared_ptr<LuminosityModelSettings>
+timeVariableLuminosityModelSettings(const std::function< double( const double ) > luminosityFunction )
+{
+    return std::make_shared< TimeVariableLuminosityModelSettings >(luminosityFunction);
+}
+
+
+inline std::shared_ptr<LuminosityModelSettings>
+timeVariableIrradianceBasedLuminosityModelSettings(const std::function< double( const double ) >  irradianceAtDistanceFunction, double distance)
+{
+    return std::make_shared< TimeVariableLuminosityModelSettings >(
+        [=](const double time){ return electromagnetism::computeLuminosityFromIrradiance(
+            irradianceAtDistanceFunction( time ), distance ); }
+        );
 }
 
 /*!
@@ -540,7 +541,7 @@ inline std::shared_ptr<PanelRadiosityModelSettings>
  */
 inline std::shared_ptr<PanelRadiosityModelSettings>
         albedoPanelRadiosityModelSettings(
-                SecondDegreeZonalPeriodicSurfacePropertyDistributionModel albedoModel,
+                KnockeTypeSurfacePropertyDistributionModel albedoModel,
                 const std::string& originalSourceName)
 {
     return std::make_shared< AlbedoPanelRadiosityModelSettings >(
@@ -586,7 +587,7 @@ inline std::shared_ptr<PanelRadiosityModelSettings>
  */
 inline std::shared_ptr<PanelRadiosityModelSettings>
         delayedThermalPanelRadiosityModelSettings(
-                SecondDegreeZonalPeriodicSurfacePropertyDistributionModel emissivityModel,
+                KnockeTypeSurfacePropertyDistributionModel emissivityModel,
                 const std::string& originalSourceName)
 {
     return std::make_shared< DelayedThermalPanelRadiosityModelSettings >(

include/tudat/simulation/environment_setup/createSurfacePropertyDistribution.h

@@ -28,7 +28,8 @@ enum class SurfacePropertyDistributionType
 {
     constant,
     spherical_harmonics,
-    second_degree_zonal_periodic
+    second_degree_zonal_periodic,
+    custom_surface_distribution
 };
 
 /*!
@@ -138,7 +139,7 @@ class SphericalHarmonicsSurfacePropertyDistributionSettings : public SurfaceProp
     Eigen::MatrixXd sineCoefficients_;
 };
 
-enum class SecondDegreeZonalPeriodicSurfacePropertyDistributionModel
+enum class KnockeTypeSurfacePropertyDistributionModel
 {
     custom,
     albedo_knocke, /**< Knocke Earth albedo model: Knocke, Philip et al. "Earth radiation pressure effects on satellites." Astrodynamics Conference. American Institute of Aeronautics and Astronautics, 1988. */
@@ -174,7 +175,7 @@ class SecondDegreeZonalPeriodicSurfacePropertyDistributionSettings : public Surf
             const double referenceEpoch,
             const double period) :
             SurfacePropertyDistributionSettings(SurfacePropertyDistributionType::second_degree_zonal_periodic),
-            model_(SecondDegreeZonalPeriodicSurfacePropertyDistributionModel::custom),
+            model_(KnockeTypeSurfacePropertyDistributionModel::custom),
             a0(a0),
             c0(c0),
             c1(c1),
@@ -189,7 +190,7 @@ class SecondDegreeZonalPeriodicSurfacePropertyDistributionSettings : public Surf
     * @param model Model to be used
     */
     explicit SecondDegreeZonalPeriodicSurfacePropertyDistributionSettings(
-            SecondDegreeZonalPeriodicSurfacePropertyDistributionModel model);
+            KnockeTypeSurfacePropertyDistributionModel model);
 
     double getA0() const
     {
@@ -227,7 +228,7 @@ class SecondDegreeZonalPeriodicSurfacePropertyDistributionSettings : public Surf
     }
 
 private:
-    SecondDegreeZonalPeriodicSurfacePropertyDistributionModel model_;
+    KnockeTypeSurfacePropertyDistributionModel model_;
 
     double a0;
     double c0;
@@ -238,6 +239,24 @@ class SecondDegreeZonalPeriodicSurfacePropertyDistributionSettings : public Surf
     double period;
 };
 
+
+class CustomSurfacePropertyDistributionSettings : public SurfacePropertyDistributionSettings
+{
+public:
+    explicit CustomSurfacePropertyDistributionSettings(
+        const std::function< double( const double, const double, const double ) > customFunction ) :
+        SurfacePropertyDistributionSettings(SurfacePropertyDistributionType::custom_surface_distribution),
+        customFunction_( customFunction ){ }
+
+    std::function< double( const double, const double, const double ) > getCustomFunction( )
+    {
+        return customFunction_;
+    }
+
+private:
+    std::function< double( const double, const double, const double ) > customFunction_;
+
+};
 /*!
  * Create settings for constant surface property distribution.
  *
@@ -287,7 +306,7 @@ inline std::shared_ptr<SurfacePropertyDistributionSettings>
  */
 inline std::shared_ptr<SurfacePropertyDistributionSettings>
         secondDegreeZonalPeriodicSurfacePropertyDistributionSettings(
-                SecondDegreeZonalPeriodicSurfacePropertyDistributionModel model)
+                KnockeTypeSurfacePropertyDistributionModel model)
 {
     return std::make_shared< SecondDegreeZonalPeriodicSurfacePropertyDistributionSettings >(model);
 }
@@ -307,6 +326,12 @@ manualSecondDegreeZonalPeriodicSurfacePropertyDistributionSettings(
         );
 }
 
+inline std::shared_ptr<SurfacePropertyDistributionSettings>
+customSurfacePropertyDistributionSettings(
+    const std::function< double( const double, const double, const double ) > customFunction )
+{
+    return std::make_shared< CustomSurfacePropertyDistributionSettings >(customFunction);
+}
 
 /*!
  * Create surface property distribution from its settings.

src/astro/electromagnetism/luminosityModel.cpp

@@ -21,6 +21,11 @@ namespace tudat
 namespace electromagnetism
 {
 
+double computeLuminosityFromIrradiance( const double irradiance, const double distance )
+{
+    return 4.0 * mathematical_constants::PI * distance * distance * irradiance;
+}
+
 void LuminosityModel::updateMembers(double currentTime)
 {
     if(currentTime_ != currentTime)
@@ -30,18 +35,5 @@ void LuminosityModel::updateMembers(double currentTime)
     }
 }
 
-double IrradianceBasedLuminosityModel::getLuminosity() const
-{
-    // The source is assumed to be isotropic
-    auto sphereArea = 4 * mathematical_constants::PI * distance_ * distance_;
-    auto luminosity = irradianceAtDistance_ * sphereArea;
-    return luminosity;
-}
-
-void IrradianceBasedLuminosityModel::updateMembers_(const double currentTime)
-{
-    // Evaluate only once per timestep since irradiance function could be expensive to evaluate
-    irradianceAtDistance_ = irradianceAtDistanceFunction_(currentTime);
-}
 } // tudat
 } // electromagnetism

src/simulation/environment_setup/createRadiationSourceModel.cpp

@@ -55,19 +55,18 @@ std::shared_ptr<electromagnetism::LuminosityModel> createLuminosityModel(
             );
             break;
         }
-        case LuminosityModelType::irradiance_based_radiant_power:
+        case LuminosityModelType::time_variable_isotropic_radiant_power :
         {
-            auto irradianceBasedLuminosityModelSettings =
-                    std::dynamic_pointer_cast< IrradianceBasedLuminosityModelSettings >(modelSettings);
-            if(irradianceBasedLuminosityModelSettings == nullptr)
+            auto variableLuminosityModelSettings =
+                std::dynamic_pointer_cast< TimeVariableLuminosityModelSettings >(modelSettings);
+            if(variableLuminosityModelSettings == nullptr)
             {
                 throw std::runtime_error(
-                        "Error, expected irradiance-based luminosity model for body " + body );
+                    "Error, expected time-variable luminosity model for body " + body );
             }
 
-            luminosityModel = std::make_shared<IrradianceBasedLuminosityModel>(
-                irradianceBasedLuminosityModelSettings->getIrradianceAtDistanceFunction(),
-                irradianceBasedLuminosityModelSettings->getDistance()
+            luminosityModel = std::make_shared<VariableLuminosityModel>(
+                variableLuminosityModelSettings->getLuminosityFuntion( )
             );
             break;
         }