Merge pull request #71 from pmackenz/master

Fixed wrong scaling from MPa to kPa and GPa to kPa
NHERI-SimCenter · Sep 30, 2017 · db49a3e · db49a3e
2 parents 458a337 + 500a1f6
commit db49a3e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -1272,7 +1272,7 @@ void MainWindow::on_Emodulus_valueChanged(double arg1)
 {
     int pileIdx = ui->pileIndex->value() - 1;
 
-    E[pileIdx] = arg1*10.0e6;
+    E[pileIdx] = arg1*1.0e6;
     this->doAnalysis();
     this->updateSystemPlot();
 }
@@ -1344,7 +1344,7 @@ void MainWindow::setActiveLayer(int layerIdx)
     ui->layerDryWeight->setValue(mSoilLayers[layerIdx].getLayerUnitWeight());
     ui->layerSaturatedWeight->setValue(mSoilLayers[layerIdx].getLayerSatUnitWeight());
     ui->layerFrictionAngle->setValue(mSoilLayers[layerIdx].getLayerFrictionAng());
-    ui->layerShearModulus->setValue((mSoilLayers[layerIdx].getLayerStiffness()/10.e3));
+    ui->layerShearModulus->setValue((mSoilLayers[layerIdx].getLayerStiffness()/1.e3));
 
     inSetupState = false;
 
@@ -1468,11 +1468,11 @@ void MainWindow::on_layerShearModulus_valueChanged(double arg1)
     int layerIdx = findActiveLayer();
 
     if (arg1 < 1.0) {
-        val = 10.0e3;
+        val = 1.0e3;
         ui->layerShearModulus->setValue(1.0);
     }
     else {
-        val = arg1*10.0e3;
+        val = arg1*1.0e3;
     }
     if (layerIdx >= 0) {
         mSoilLayers[layerIdx].setLayerStiffness( (val) );