Commit e6974cc1 authored by Luc Maisonobe's avatar Luc Maisonobe

Removed spurious field.

parent 8d920b8e
...@@ -92,9 +92,6 @@ class ZonalContribution implements DSSTForceModel { ...@@ -92,9 +92,6 @@ class ZonalContribution implements DSSTForceModel {
/** Coefficient used to define the mean disturbing function V<sub>ns</sub> coefficient. */ /** Coefficient used to define the mean disturbing function V<sub>ns</sub> coefficient. */
private final TreeMap<NSKey, Double> Vns; private final TreeMap<NSKey, Double> Vns;
/** Highest power of the eccentricity to be used in series expansion. */
private int maxEccPow;
/** Highest power of the eccentricity to be used in mean elements computations. */ /** Highest power of the eccentricity to be used in mean elements computations. */
private int maxEccPowMeanElements; private int maxEccPowMeanElements;
...@@ -215,8 +212,7 @@ class ZonalContribution implements DSSTForceModel { ...@@ -215,8 +212,7 @@ class ZonalContribution implements DSSTForceModel {
} }
// Initialize default values // Initialize default values
this.maxEccPow = (maxDegree == 2) ? 0 : Integer.MIN_VALUE; this.maxEccPowMeanElements = (maxDegree == 2) ? 0 : Integer.MIN_VALUE;
this.maxEccPowMeanElements = maxEccPow;
this.maxEccPowShortPeriodics = maxDegree - 1; this.maxEccPowShortPeriodics = maxDegree - 1;
} }
...@@ -245,6 +241,7 @@ class ZonalContribution implements DSSTForceModel { ...@@ -245,6 +241,7 @@ class ZonalContribution implements DSSTForceModel {
computeMeanElementsTruncations(aux); computeMeanElementsTruncations(aux);
final int maxEccPow;
if (!meanOnly) { if (!meanOnly) {
maxEccPow = FastMath.max(maxEccPowMeanElements, maxEccPowShortPeriodics); maxEccPow = FastMath.max(maxEccPowMeanElements, maxEccPowShortPeriodics);
} else { } else {
...@@ -624,7 +621,8 @@ class ZonalContribution implements DSSTForceModel { ...@@ -624,7 +621,8 @@ class ZonalContribution implements DSSTForceModel {
// generate the Cij and Sij coefficients // generate the Cij and Sij coefficients
final FourierCjSjCoefficients cjsj = new FourierCjSjCoefficients(meanState.getDate(), final FourierCjSjCoefficients cjsj = new FourierCjSjCoefficients(meanState.getDate(),
maxDegreeShortPeriodics, maxEccPow); maxDegreeShortPeriodics,
maxEccPowShortPeriodics);
computeCijSijCoefficients(meanState.getDate(), slot, cjsj, rhoSigma); computeCijSijCoefficients(meanState.getDate(), slot, cjsj, rhoSigma);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment