kz - merge from upstream

NHERI-SimCenter · Apr 7, 2022 · bfe6b99 · bfe6b99
2 parents 5b2ff01 + 747da40
commit bfe6b99
Show file tree

Hide file tree

Showing 47 changed files with 227 additions and 131 deletions.
diff --git a/Examples/Examples_all.json b/Examples/Examples_all.json
@@ -88,7 +88,11 @@
     {
       "name": "Two-Dimensional Truss: PLoM Modeling and Simulation",
       "description": "In this example, the goal is to demonstrate the use of PLoM model method to predict the response of the example truss under the given load.",
-      "inputFile": "qfem-0022/src/input.json"
+      "inputFile": "qfem-0022/src/input.json"},
+    {
+      "name": "Surrogate modeling with design of experiments",
+      "description": "In this example illustrates different design of experiments strategies.",
+      "inputFile": "qfem-0021/src/input.json"
     }
   ]
 }
diff --git a/Examples/qfem-0001/figures/trussFEM.png b/Examples/qfem-0001/figures/trussFEM.png
diff --git a/Examples/qfem-0001/figures/trussFORM-RES.png b/Examples/qfem-0001/figures/trussFORM-RES.png
diff --git a/Examples/qfem-0001/figures/trussFORM-UQ.png b/Examples/qfem-0001/figures/trussFORM-UQ.png
diff --git a/Examples/qfem-0001/figures/trussGlobal-UQ.png b/Examples/qfem-0001/figures/trussGlobal-UQ.png
diff --git a/Examples/qfem-0001/figures/trussQoI.png b/Examples/qfem-0001/figures/trussQoI.png
diff --git a/Examples/qfem-0001/figures/trussRES1.png b/Examples/qfem-0001/figures/trussRES1.png
diff --git a/Examples/qfem-0001/figures/trussRES2.png b/Examples/qfem-0001/figures/trussRES2.png
diff --git a/Examples/qfem-0001/figures/trussRES3.png b/Examples/qfem-0001/figures/trussRES3.png
diff --git a/Examples/qfem-0001/figures/trussRES4.png b/Examples/qfem-0001/figures/trussRES4.png
diff --git a/Examples/qfem-0001/figures/trussRES5.png b/Examples/qfem-0001/figures/trussRES5.png
diff --git a/Examples/qfem-0001/figures/trussRV.png b/Examples/qfem-0001/figures/trussRV.png
diff --git a/Examples/qfem-0001/figures/trussSens-UQ.png b/Examples/qfem-0001/figures/trussSens-UQ.png
diff --git a/Examples/qfem-0001/figures/trussSensitivity-RES.png b/Examples/qfem-0001/figures/trussSensitivity-RES.png
diff --git a/Examples/qfem-0001/figures/trussUQ.png b/Examples/qfem-0001/figures/trussUQ.png
diff --git a/Examples/qfem-0009/README.rst b/Examples/qfem-0009/README.rst
@@ -124,29 +124,29 @@ QuoFEM also supports MCS-based sensitivity analysis method offered in Dakota eng
      - N=500
      - N=1000
    * - E
-     - 0.74
-     - 0.19
-     - 0.14
-     - 0.12
-     - 0.12
-   * - P
-     - 0.76
-     - 0.35
-     - 0.28
+     - 0.18
      - 0.23
      - 0.23
+     - 0.12
+     - 0.13
+   * - P
+     - 0.60
+     - 0.36
+     - 0.29
+     - 0.24
+     - 0.25
    * - Ao
-     - 0.16
-     - 0.39
-     - 0.42
+     - 0.06
+     - 0.45
      - 0.42
-     - 0.44
+     - 0.43
+     - 0.46
    * - Au
-     - 0.28
-     - 0.32
-     - 0.27
-     - 0.17
-     - 0.15
+     - 0.26
+     - 0.29
+     - 0.25
+     - 0.18
+     - 0.16
 
 .. list-table:: Dakota: Sensitivity indices from different number of samples (the first raw is the user-specified number of samples and the second raw is the actual number of simulation calls)
    :header-rows: 2

diff --git a/Examples/qfem-0009/figures/trussPDF.PNG b/Examples/qfem-0009/figures/trussPDF.PNG
diff --git a/Examples/qfem-0009/figures/trussSensitivity-RES-SimUQ.png b/Examples/qfem-0009/figures/trussSensitivity-RES-SimUQ.png
diff --git a/Examples/qfem-0009/figures/trussSensitivity-RES-SimUQ2.png b/Examples/qfem-0009/figures/trussSensitivity-RES-SimUQ2.png
diff --git a/Examples/qfem-0009/figures/trussSensitivity-advanced.png b/Examples/qfem-0009/figures/trussSensitivity-advanced.png
diff --git a/Examples/qfem-0009/figures/trussSensitivity-corr.png b/Examples/qfem-0009/figures/trussSensitivity-corr.png
diff --git a/Examples/qfem-0009/figures/trussSensitivity-input-SimUQ.png b/Examples/qfem-0009/figures/trussSensitivity-input-SimUQ.png
diff --git a/Examples/qfem-0009/src/input.json b/Examples/qfem-0009/src/input.json
@@ -83,17 +83,17 @@
             "mean": 500,
             "name": "Au",
             "refCount": 1,
-            "stdDev": 25,
+            "stdDev": 100,
             "value": "RV.Au",
             "variableClass": "Uncertain"
         },
         {
-            "distribution": "Normal",
+            "distribution": "Lognormal",
             "inputType": "Moments",
             "mean": 250,
             "name": "Ao",
             "refCount": 1,
-            "stdDev": 10,
+            "stdDev": 50,
             "value": "RV.Ao",
             "variableClass": "Uncertain"
         }

diff --git a/Examples/qfem-0015/README.rst b/Examples/qfem-0015/README.rst
@@ -198,7 +198,9 @@ Once surrogate model is constructed, it can be used for various UQ/optimization
    :figclass: align-center
    :width: 1200
 
-5. Once the SurrogateGP Info field in the **FEM** tab is entered, the **QoI tab** is automatically populated. Users are allowed to remove some of the QoIs if not interested but may not add new QoIs or modify the names of existing QoIs.
+
+5. Users need to manually fill in the **QoI tab**. Users do not need to include here all the QoIs used for the training, but the users may not add new QoIs or modify the names of existing QoIs. [Tip] List of the trained QoI names can be found and copied in the **FEM tab**.
+
 
 .. figure:: figures/SUR-VER5.png
    :align: center

diff --git a/Examples/qfem-0015/figures/SUR-FEMtab.png b/Examples/qfem-0015/figures/SUR-FEMtab.png
diff --git a/Examples/qfem-0015/figures/SUR-QoItab.png b/Examples/qfem-0015/figures/SUR-QoItab.png
diff --git a/Examples/qfem-0015/figures/SUR-RVtab.png b/Examples/qfem-0015/figures/SUR-RVtab.png
diff --git a/Examples/qfem-0015/figures/SUR-UQtab1.png b/Examples/qfem-0015/figures/SUR-UQtab1.png
diff --git a/Examples/qfem-0015/figures/SUR-VER2.png b/Examples/qfem-0015/figures/SUR-VER2.png
diff --git a/Examples/qfem-0015/figures/SUR-VER3.png b/Examples/qfem-0015/figures/SUR-VER3.png
diff --git a/Examples/qfem-0015/figures/SUR-VER4.png b/Examples/qfem-0015/figures/SUR-VER4.png
diff --git a/Examples/qfem-0015/figures/SUR-VER5.png b/Examples/qfem-0015/figures/SUR-VER5.png
diff --git a/Examples/qfem-0015/src/input.json b/Examples/qfem-0015/src/input.json
@@ -58,142 +58,142 @@
         {
             "distribution": "Uniform",
             "inputType": "Parameters",
-            "lowerbound": 0.45,
+            "lowerbound": 0.2,
             "name": "materialQuality",
-            "refCount": 1,
-            "upperbound": 0.55,
+            "refCount": 4,
+            "upperbound": 1,
             "value": "RV.materialQuality",
-            "variableClass": "Uniform"
+            "variableClass": "Uncertain"
         },
         {
             "distribution": "Uniform",
             "inputType": "Parameters",
-            "lowerbound": 1350,
+            "lowerbound": 800,
             "name": "planArea",
-            "refCount": 1,
-            "upperbound": 1650,
+            "refCount": 4,
+            "upperbound": 2400,
             "value": "RV.planArea",
-            "variableClass": "Uniform"
+            "variableClass": "Uncertain"
         },
         {
             "distribution": "Uniform",
             "inputType": "Parameters",
-            "lowerbound": 0.54,
+            "lowerbound": 0.4,
             "name": "aspectRatio",
-            "refCount": 1,
-            "upperbound": 0.66,
+            "refCount": 4,
+            "upperbound": 0.8,
             "value": "RV.aspectRatio",
-            "variableClass": "Uniform"
+            "variableClass": "Uncertain"
         },
         {
             "distribution": "Uniform",
             "inputType": "Parameters",
-            "lowerbound": 0.063,
+            "lowerbound": 0.02,
             "name": "damping",
-            "refCount": 1,
-            "upperbound": 0.077,
+            "refCount": 4,
+            "upperbound": 0.1,
             "value": "RV.damping",
-            "variableClass": "Uniform"
+            "variableClass": "Uncertain"
         },
         {
             "distribution": "Uniform",
             "inputType": "Parameters",
-            "lowerbound": 0.585,
+            "lowerbound": 0.5,
             "name": "extDensity_x",
-            "refCount": 1,
-            "upperbound": 0.715,
+            "refCount": 4,
+            "upperbound": 0.8,
             "value": "RV.extDensity_x",
-            "variableClass": "Uniform"
+            "variableClass": "Uncertain"
         },
         {
             "distribution": "Uniform",
             "inputType": "Parameters",
-            "lowerbound": 0.54,
+            "lowerbound": 0.5,
             "name": "extDensity_z",
-            "refCount": 1,
-            "upperbound": 0.66,
+            "refCount": 4,
+            "upperbound": 0.8,
             "value": "RV.extDensity_z",
-            "variableClass": "Uniform"
+            "variableClass": "Uncertain"
         },
         {
             "distribution": "Uniform",
             "inputType": "Parameters",
-            "lowerbound": 0.063,
+            "lowerbound": 0.06,
             "name": "intDensity",
-            "refCount": 1,
-            "upperbound": 0.077,
+            "refCount": 4,
+            "upperbound": 0.08,
             "value": "RV.intDensity",
-            "variableClass": "Uniform"
+            "variableClass": "Uncertain"
         },
         {
             "distribution": "Uniform",
             "inputType": "Parameters",
-            "lowerbound": 0.18,
+            "lowerbound": 0,
             "name": "extEcc_x",
-            "refCount": 1,
-            "upperbound": 0.22,
+            "refCount": 4,
+            "upperbound": 0.5,
             "value": "RV.extEcc_x",
-            "variableClass": "Uniform"
+            "variableClass": "Uncertain"
         },
         {
             "distribution": "Uniform",
             "inputType": "Parameters",
-            "lowerbound": 0.18,
+            "lowerbound": 0,
             "name": "extEcc_z",
-            "refCount": 1,
-            "upperbound": 0.22,
+            "refCount": 4,
+            "upperbound": 0.5,
             "value": "RV.extEcc_z",
-            "variableClass": "Uniform"
+            "variableClass": "Uncertain"
         },
         {
             "distribution": "Uniform",
             "inputType": "Parameters",
-            "lowerbound": 0.18,
+            "lowerbound": 0,
             "name": "intEcc_x",
-            "refCount": 1,
-            "upperbound": 0.22,
+            "refCount": 4,
+            "upperbound": 0.5,
             "value": "RV.intEcc_x",
-            "variableClass": "Uniform"
+            "variableClass": "Uncertain"
         },
         {
             "distribution": "Uniform",
             "inputType": "Parameters",
-            "lowerbound": 0.18,
+            "lowerbound": 0,
             "name": "intEcc_z",
-            "refCount": 1,
-            "upperbound": 0.22,
+            "refCount": 4,
+            "upperbound": 0.5,
             "value": "RV.intEcc_z",
-            "variableClass": "Uniform"
+            "variableClass": "Uncertain"
         },
         {
             "distribution": "Uniform",
             "inputType": "Parameters",
-            "lowerbound": 11.7,
+            "lowerbound": 10,
             "name": "floor1Weight",
-            "refCount": 1,
-            "upperbound": 14.3,
+            "refCount": 4,
+            "upperbound": 15.5,
             "value": "RV.floor1Weight",
-            "variableClass": "Uniform"
+            "variableClass": "Uncertain"
         },
         {
             "distribution": "Uniform",
             "inputType": "Parameters",
-            "lowerbound": 11.7,
+            "lowerbound": 10,
             "name": "floor2Weight",
-            "refCount": 1,
-            "upperbound": 14.3,
+            "refCount": 4,
+            "upperbound": 15.5,
             "value": "RV.floor2Weight",
-            "variableClass": "Uniform"
+            "variableClass": "Uncertain"
         },
         {
             "distribution": "Uniform",
             "inputType": "Parameters",
-            "lowerbound": 9.9,
+            "lowerbound": 10,
             "name": "roofWeight",
-            "refCount": 1,
-            "upperbound": 12.1,
+            "refCount": 4,
+            "upperbound": 15.5,
             "value": "RV.roofWeight",
-            "variableClass": "Uniform"
+            "variableClass": "Uncertain"
         }
     ],
     "remoteAppDir": "C:/Users/SimCenter/Sangri/SimCenterBackendApplications",
-Original file line number
+Diff line change
@@ Expand Up @@
          - N=500
          - N=1000
        * - E
-         - 0.74
-         - 0.19
-         - 0.14
-         - 0.12
-         - 0.12
-       * - P
-         - 0.76
-         - 0.35
-         - 0.28
+         - 0.18
          - 0.23
          - 0.23
+         - 0.12
+         - 0.13
+       * - P
+         - 0.60
+         - 0.36
+         - 0.29
+         - 0.24
+         - 0.25
        * - Ao
-         - 0.16
-         - 0.39
-         - 0.42
+         - 0.06
+         - 0.45
          - 0.42
-         - 0.44
+         - 0.43
+         - 0.46
        * - Au
-         - 0.28
-         - 0.32
-         - 0.27
-         - 0.17
-         - 0.15
+         - 0.26
+         - 0.29
+         - 0.25
+         - 0.18
+         - 0.16
     .. list-table:: Dakota: Sensitivity indices from different number of samples (the first raw is the user-specified number of samples and the second raw is the actual number of simulation calls)
        :header-rows: 2
@@ Expand Down @@