Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/base/angle.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

/** @brief Angle in radians.
* @ingroup vector3dGroup
* Its only used to distinguish between doubles and angles in input/output.
* It's only used to distinguish between doubles and angles in input/output.
* Angle is converted from/to degrees in input/output. */
class Angle
{
Expand Down
2 changes: 1 addition & 1 deletion source/base/ellipsoid.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class Ellipsoid

/** @brief Transformation ellipsoidal coordinates in @a Vector3d.
* @param L longitude (-PI,PI]
* @param B latitude [-PI,PI]
* @param B latitude [-PI/2,PI/2]
* @param h height [m]
*/
const Vector3d operator()(Angle L, Angle B, Double h) const;
Expand Down
4 changes: 2 additions & 2 deletions source/base/portable.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @brief Define standard types.
*
* This is important to account for different systems.
* e.g. 'int' have some times 16 Bit or 32 Bit size.
* e.g. 'int' have sometimes 16 Bit or 32 Bit size.
*
* @author Torsten Mayer-Guerr
* @date 2004-10-25
Expand Down Expand Up @@ -36,7 +36,7 @@

/** @brief Standard types.
* This is important to account for different systems.
* e.g. 'int' have some times 16 Bit or 32 Bit size.
* e.g. 'int' have sometimes 16 Bit or 32 Bit size.
*/
//@{
typedef float Float;
Expand Down
2 changes: 1 addition & 1 deletion source/config/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ void ProgramConfig::run(VariableList &variableList, Parallel::CommunicatorPtr co
{
std::string comment;
StackNode top = config.stack.top();
config.stack.pop(); // coment is given in <program> not in <choiceElement>
config.stack.pop(); // comment is given in <program> not in <choiceElement>
XmlAttrPtr attr = config.stack.top().xmlNode->getAttribute("comment");
if(attr)
comment = attr->getText();
Expand Down
6 changes: 3 additions & 3 deletions source/files/fileGriddedData.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -230,10 +230,10 @@ template<> void load(InArchive &ar, GriddedData &x)
for(UInt i=0; i<pointCount; i++)
{
ar>>beginGroup("points");
ar>>nameValue("longitude", lat);
ar>>nameValue("latitude", lon);
ar>>nameValue("longitude", lon);
ar>>nameValue("latitude", lat);
ar>>nameValue("height", h);
x.points.at(i) = x.ellipsoid(lat, lon, h);
x.points.at(i) = x.ellipsoid(lon, lat, h);
if(hasArea)
ar>>nameValue("areas", x.areas.at(i));
for(UInt k=0; k<x.values.size(); k++)
Expand Down
4 changes: 2 additions & 2 deletions source/plot/plotMapLayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
// Latex documentation
static const char *docstringPlotMapLayerGrid = R"(
\subsection{GriddedData}
Creates a regular grid of yxz values. The standard \reference{dataVariables}{general.parser:dataVariables}
Creates a regular grid of xyz values. The standard \reference{dataVariables}{general.parser:dataVariables}
are available to select the data column of \configFile{inputfileGriddedData}{griddedData}.
Empty grid cells are not plotted. Cells with more than one value will be set to the mean value.
The grid spacing can be determined automatically for regular rectangular grids otherwise
it must be set with \config{increment}. To get a better display together with some projections
the grid should be internally \config{resample}d to higher resolution.
It is assumed that the points of \configFile{inputfileGriddedData}{griddedData} represents centers of grid cells.
This assumption can be changed with \config{gridlineRegistered} (e.g if the data starts at the north pole).
This assumption can be changed with \config{gridlineRegistered} (e.g. if the data starts at the north pole).
)";

class PlotMapLayerGrid : public PlotMapLayer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@
// Latex documentation
#define DOCSTRING docstring
static const char *docstring = R"(
This program integrates an orbit dynamically using the given forces and setup the state transition matrix
for each time step. These are the prerequisite for a least squares adjustement (e.g. gravity field determination) using
the variational equation approach. The variational equations are computed arc wise as defined by \configFile{inputfileOrbit}{instrument}.
This means for each arc new initial state parameters are setup.
This program integrates an orbit dynamically using the given forces and set up the state transition matrix
for each time step. These are the prerequisites for a least squares adjustment (e.g. gravity field determination) using
the variational equation approach. The variational equations are computed arc-wise as defined by \configFile{inputfileOrbit}{instrument}.
This means for each arc new initial state parameters are set up.

In a first step the \configClass{forces}{forcesType} acting on the satellite are evaluated at the apriori positions given
by \configFile{inputfileOrbit}{instrument}. Non-conservative forces like solar radiation pressure needs the orientation of the
satellite (\configFile{inputfileStarCamera}{instrument}) and additional a satellite macro model (\config{satelliteModel})
by \configFile{inputfileOrbit}{instrument}. Non-conservative forces like solar radiation pressure need the orientation of the
satellite (\configFile{inputfileStarCamera}{instrument}) and additionally, a satellite macro model (\config{satelliteModel})
with the surface properties. Furthermore \configFile{inputfileAccelerometer}{instrument} observations are also considered.

In a second step the accelerations are integrated twice to an dynamic orbit using a moving polynomial with the degree
In a second step the accelerations are integrated twice to a dynamic orbit using a moving polynomial with the degree
\config{integrationDegree}. The orbit is corrected to be self-consistent. This means the forces should be evaluated
at the new integrated positions instead of the apriori ones. This correction is computed in a linear approximation
using the gradient of the forces with respect to the positions (\config{gradientfield}). As this term is small generally
only the largest force components has to be considered. A low degree spherical harmonic expansion of the static gravity
only the largest force components have to be considered. A low degree spherical harmonic expansion of the static gravity
field (about up to degree 5) is sufficient in almost all cases. In this step also the state transition matrix (the partial
derivatices of the current state, position and velocity) with respect to the initial state is computed.
derivatives of the current state, position and velocity) with respect to the initial state is computed.
The integrated orbit together with the state transitions are stored in \configFile{outputfileVariational}{variationalEquation},
the integrated orbit only in \configFile{outputfileOrbit}{instrument}.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ and stochastic pulses (velocity jumps) at given times, \configClass{stochasticPu
\configFile{outputfileSolution}{matrix} and an extra file with the parameter names is created. The fitted orbit is written
as new reference in \configFile{outputfileVariational}{variationalEquation} and additionally in \configFile{outputfileOrbit}{instrument}.

The observed orbit positions (\configFile{inputfileOrbit}{instrument}) together with the epoch wise covariance matrix
(\configFile{inputfileCovariancePodEpoch}{instrument}) must be splitted in the same arcs as the variational equations but not
necessarily uniform distributed (use irregularData in \program{InstrumentSynchronize}). An iterative downweighting of
The observed orbit positions (\configFile{inputfileOrbit}{instrument}) together with the epoch-wise covariance matrix
(\configFile{inputfileCovariancePodEpoch}{instrument}) must be split in the same arcs as the variational equations but not
necessarily uniformly distributed (use irregularData in \program{InstrumentSynchronize}). An iterative downweighting of
outliers is performed by M-Huber method.

The observation equations (parameter sensitity matrix) are computed by integration of the variational equations
The observation equations (parameter sensitivity matrix) are computed by integration of the variational equations
(\configFile{inputfileVariational}{variationalEquation}) using a polynomial with \config{integrationDegree} and interpolated to the
observation epochs using a polynomial with \config{interpolationDegree}.

All parameters used here must be reestimated in the full least squares adjustment
for the gravity field determination to get a solution which is not biased towards the reference field.
The solution of additional estimations are relative (deltas) as the parameters are already used as Taylor point
The solutions of additional estimations are relative (deltas) as the parameters are already used as Taylor point
in the reference orbit.

See also \program{PreprocessingVariationalEquation}.
Expand Down