Fixed logic in application of smooth strain spectrum.

Author: arkottke

source/FrequencyDependentCalculator.cpp

@@ -76,36 +76,8 @@ bool FrequencyDependentCalculator::updateSubLayer(
     }
 
     const QVector<double> strainFas = _motion->absFourierVel(strainTf);
-
     const QVector<double> &freq = _motion->freq();
 
-    // Compute the mean frequency and mean strain parameters defined by Kausel and Assimaki (2002)
-    double numer = 0;
-    double denom = 0;
-    double dFreq;
-
-    for (int i = 1; i < freq.size(); ++i) {
-        dFreq = freq.at(i) - freq.at(i-1);
-        numer += dFreq * (freq.at(i-1) * strainFas.at(i-1)
-                          + freq.at(i) * strainFas.at(i)) / 2.;
-        denom += dFreq * (strainFas.at(i-1) + strainFas.at(i)) / 2.;
-    }
-
-    const double freqAvg = numer / denom;
-
-    double sum = 0;
-    int offset = 1;
-
-    while (freq.at(offset) < freqAvg) {
-        dFreq = freq.at(offset) - freq.at(offset-1);
-        sum += dFreq * (strainFas.at(offset-1) + strainFas.at(offset)) / 2.;
-        ++offset;
-
-        Q_ASSERT(offset < freq.size());
-    }
-
-    const double strainAvg = sum / freqAvg;
-
     // Update the sublayer with the representative strain -- FIXME strainAvg doesn't appear to be representative
     _site->subLayers()[index].setStrain(strainMax, strainMax);
 
@@ -115,6 +87,33 @@ bool FrequencyDependentCalculator::updateSubLayer(
     const SubLayer &sl = _site->subLayers().at(index);
 
     if (_useSmoothSpectrum) {
+        // Compute the mean frequency and mean strain parameters defined by Kausel and Assimaki (2002)
+        double numer = 0;
+        double denom = 0;
+        double dFreq;
+
+        for (int i = 1; i < freq.size(); ++i) {
+            dFreq = freq.at(i) - freq.at(i-1);
+            numer += dFreq * (freq.at(i-1) * strainFas.at(i-1)
+                              + freq.at(i) * strainFas.at(i)) / 2.;
+            denom += dFreq * (strainFas.at(i-1) + strainFas.at(i)) / 2.;
+        }
+
+        const double freqAvg = numer / denom;
+
+        double sum = 0;
+        int offset = 1;
+
+        while (freq.at(offset) < freqAvg) {
+            dFreq = freq.at(offset) - freq.at(offset-1);
+            sum += dFreq * (strainFas.at(offset-1) + strainFas.at(offset)) / 2.;
+            ++offset;
+
+            Q_ASSERT(offset < freq.size());
+        }
+
+        const double strainAvg = sum / freqAvg;
+
         // Calculate model parameter using a least squares fit
         const int n = _nf - offset;
         double chisq;