Navigation Menu

Skip to content

Commit

Permalink
renaming bodyRadius param to centralBodyRadius
Browse files Browse the repository at this point in the history
  • Loading branch information
Jordan Stephens committed Mar 15, 2015
1 parent b8dc14c commit 98daf98
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions lib/orbit.js
Expand Up @@ -12,15 +12,15 @@ function Orbit(r, v, opts) {
this.r = r;
this.v = v;
this.mu = (opts && opts.mu) || constants.MU;
this.bodyRadius = (opts && opts.bodyRadius) || constants.EARTH_RADIUS;
this.centralBodyRadius = (opts && opts.centralBodyRadius) || constants.EARTH_RADIUS;
}

Orbit.fromParams = function fromParams(params) {
var state = ParamHelper.stateFromParams(params);

return new Orbit(state.r, state.v, {
mu: params.mu,
bodyRadius: params.bodyRadius
centralBodyRadius: params.centralBodyRadius
});
};

Expand Down Expand Up @@ -128,7 +128,7 @@ Orbit.prototype.update = function update(dt) {

return new Orbit(r, v, {
mu: mu,
bodyRadius: this.bodyRadius
centralBodyRadius: this.centralBodyRadius
});
};

Expand Down
14 changes: 7 additions & 7 deletions lib/param-helper.js
Expand Up @@ -51,8 +51,8 @@ function expandedParams(params) {
var paramKeys = Object.keys(params);

if (ld.includes(paramKeys, "apogee") && ld.includes(paramKeys, "perigee")) {
params.semimajorAxis = semimajorAxisFromApogeeAndPerigee(params.apogee, params.perigee, params.bodyRadius);
params.eccentricity = eccentricityFromSemimajorAxisAndPerigee(params.semimajorAxis, params.perigee, params.bodyRadius);
params.semimajorAxis = semimajorAxisFromApogeeAndPerigee(params.apogee, params.perigee, params.centralBodyRadius);
params.eccentricity = eccentricityFromSemimajorAxisAndPerigee(params.semimajorAxis, params.perigee, params.centralBodyRadius);
} else if (ld.includes(paramKeys, "semilatusRectum")) {
params.semimajorAxis = semimajorAxisFromSemilatusRectumAndEccentricity(params.semilatusRectum, params.eccentricity);
}
Expand Down Expand Up @@ -127,7 +127,7 @@ function baseParams(params) {
}

params.mu = constants.MU;
params.bodyRadius = constants.EARTH_RADIUS;
params.centralBodyRadius = constants.EARTH_RADIUS;

return ld.extend({}, DEFAULT_PARAMS, params);
}
Expand All @@ -144,12 +144,12 @@ function semimajorAxisFromSemilatusRectumAndEccentricity(semilatusRectum, eccent
return semilatusRectum / (1 - Math.pow(eccentricity, 2));
}

function semimajorAxisFromApogeeAndPerigee(apogee, perigee, bodyRadius) {
return ((bodyRadius * 2) + apogee + perigee) / 2.0;
function semimajorAxisFromApogeeAndPerigee(apogee, perigee, centralBodyRadius) {
return ((centralBodyRadius * 2) + apogee + perigee) / 2.0;
}

function eccentricityFromSemimajorAxisAndPerigee(semimajorAxis, perigee, bodyRadius) {
return (semimajorAxis / (bodyRadius + perigee)) - 1;
function eccentricityFromSemimajorAxisAndPerigee(semimajorAxis, perigee, centralBodyRadius) {
return (semimajorAxis / (centralBodyRadius + perigee)) - 1;
}

function toRad(deg) {
Expand Down

0 comments on commit 98daf98

Please sign in to comment.