Merge pull request NHERI-SimCenter#100 from yisangriB/master

sy - updating documentation example

Author: fmckenna

EVENTS/EarthquakeEventSelection.cpp

@@ -80,7 +80,6 @@ EarthquakeEventSelection::EarthquakeEventSelection(RandomVariablesContainer *the
     //
 
     QHBoxLayout *theSelectionLayout = new QHBoxLayout();
-    //    QLabel *label = new QLabel();
     SectionTitle *label=new SectionTitle();
     label->setMinimumWidth(250);
     label->setText(QString("Load Generator"));
@@ -94,17 +93,20 @@ EarthquakeEventSelection::EarthquakeEventSelection(RandomVariablesContainer *the
     eventSelection->addItem(tr("Multiple PEER"));
     eventSelection->addItem(tr("Multiple SimCenter"));
     eventSelection->addItem(tr("User Specified Database"));
-    //    eventSelection->addItem(tr("Hazard Based Event"));
+    // eventSelection->addItem(tr("Hazard Based Event"));
     // eventSelection->addItem(tr("User Application"));
     eventSelection->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
     eventSelection->setItemData(1, "A Seismic event using Seismic Hazard Analysis and Record Selection/Scaling", Qt::ToolTipRole);
 
+    eventSelection->setMinimumWidth(250);
+    eventSelection->setMaximumHeight(25);
+
     theSelectionLayout->addWidget(label);
-    QSpacerItem *spacer = new QSpacerItem(50,10);
-    theSelectionLayout->addItem(spacer);
+    //QSpacerItem *spacer = new QSpacerItem(50,1);
+    //theSelectionLayout->addItem(spacer);
     theSelectionLayout->addWidget(eventSelection);
     theSelectionLayout->addStretch();
-    layout->addLayout(theSelectionLayout,0,1,1,1);
+    layout->addLayout(theSelectionLayout,0,1);
 
     //
     // create the stacked widget
@@ -162,7 +164,7 @@ EarthquakeEventSelection::EarthquakeEventSelection(RandomVariablesContainer *the
 
     //layout->addWidget(theStackedWidget);
     //layout->addWidget(sa);
-    layout->setMargin(0);
+    //layout->setMargin(0);
 
     // add Intensity Widget
     //theSCIMWidget = new SimCenterIntensityMeasureWidget();
@@ -185,6 +187,11 @@ EarthquakeEventSelection::EarthquakeEventSelection(RandomVariablesContainer *the
 
     connect(eventSelection, SIGNAL(currentIndexChanged(QString)), this, SLOT(eventSelectionChanged(QString)));
 
+    global_layout->setSpacing(0);
+    layout->setSpacing(0);
+    global_layout->setContentsMargins(0,0,0,0);
+    layout->setContentsMargins(0,0,0,0);
+
 }
 
 EarthquakeEventSelection::~EarthquakeEventSelection()

Examples/eeuq-0010/README.rst

@@ -56,7 +56,7 @@ Define Target Structure
 Select Ground Motions
 ^^^^^^^^^^^^^^^^^^^^^^
 
-4. In **EVT tab**, **PEER NGA ground motion records** is selected. Let us consider the site of interest located at (37.8715, -122.273), Hard Rock (A) site class. From ASCE 7-16, the design spectrum for risk category I (low hazard) can be obtained. Let us select 30 ground motion time histories that match this spectrum by clicking **Select records**button. The target response spectrum curve and the selected ground motions will be displayed in the right-hand side panel as shown below.
+4. In **EVT tab**, **PEER NGA ground motion records** option is selected. Let us consider the site of interest located at (37.8715, -122.273), of which we would like to select ground motions that follows USGS Uniform Hazard Spectrum (2014 v4.2.0) with return period 2475. Vs30 is assumed 760 m/s. Let us select 30 ground motion time histories that match this spectrum by clicking **Select records** button. The target response spectrum curve and the selected ground motions will be displayed on the right-hand side panel as shown below.
 
       .. figure:: figures/EE10_EVT1.png
          :name: UQ inputs
@@ -175,23 +175,35 @@ Run the Analysis and Process Results
       * The term "90% prediction interval" is the interval in which the exact "response", i.e. dynamic simulation output, will fall with 90% probability.
       * The term "90% confidence interval" is the estimated range of the "mean response". Therefore, the confidence interval is always tighter than the prediction interval.
 
-11. **[Verification]** Only for verification purposes, an additional forward propagation is performed using the exact simulation model instead of the surrogate model, using the exact same ground motion/structural parameters. For this, UQ, GI, EVT, RV tabs are kept unchanged, and SIM, FEM, EDP tabs are modified to replace the surrogate with the original model, i.e. for SIM, FEM, EDP tabs, the exact same configuration used in :ref:`example 09<eeuq-0009>` was used.  Below is a comparison of the obtained median (and log-mean) and log-standard deviation of the EDPs from 30 samples:
+11. **[Verification]** Only for verification purposes, an additional forward propagation is performed using the exact simulation model instead of the surrogate model, using the exact same ground motion/structural parameters. For this, UQ, GI, EVT, RV tabs are kept unchanged, and SIM, FEM, EDP tabs are modified to replace the surrogate with the original model, i.e. for SIM, FEM, EDP tabs, the exact same configuration used in :ref:`example 09<eeuq-0009>` was used.  Below is a comparison of the obtained mean log-EDPs from 30 samples:
 
 
    .. figure:: figures/EE10_RES4_1.png
          :name: UQ inputs
          :align: center
-         :width: 900
+         :width: 700
          :figclass: align-center
 
-         Comparison of median
+         Comparing median of log-EDP
+
+The same comparison in the original scale shown below.
 
    .. figure:: figures/EE10_RES4_2.png
          :name: UQ inputs
          :align: center
-         :width: 400
+         :width: 700
          :figclass: align-center
 
          Comparison of log-standard deviation
 
+On the other hand, log-standard deviation of the EDPs from 30 samples are obtained as below.
+
+   .. figure:: figures/EE10_RES4_3.png
+         :name: UQ inputs
+         :align: center
+         :width: 700
+         :figclass: align-center
+
+         Comparing standard deviation of log-EDP
+
 The estimated medians of EDPs from the surrogate and the original model show in general good agreement. The standard deviation of the surrogate model is larger partly because of the added uncertainty in surrogate model approximation. The difference in the statistics may also attribute to the small sample size of 30.

Examples/eeuq-0010/figures/EE10_EVT1.png

@@ -1,19 +1,29 @@
+figid = 200;
+
 
 names = {"1-PFA-0-1", "1-PFA-0-2", "1-PFA-1-1", "1-PFA-1-2", "1-PFD-1-1", "1-PFD-1-2", "1-PID-1-1", "1-PFA-2-1", "1-PFA-2-2", "1-PFD-2-1", "1-PFD-2-2", "1-PID-2-1", "1-PFA-3-1", "1-PFA-3-2", "1-PFD-3-1", "1-PFD-3-2", "1-PID-3-1", "1-PRD-1-1"}
 idPSA = [1,2,3,4,8,9,13,14];
 idPFD = [5,6,10,11,15,16];
+idPID = [7,12,17];
 
 
 sur = readmatrix("sur.csv",'NumHeaderLines',1);
-sim = readmatrix("sim.csv",'NumHeaderLines',1);
-mediansur = (mean(log(sur(:,9:9+17))));
-mediansim = (mean(log(sim(:,4:4+17))));
+sim = readmatrix("sim2.csv",'NumHeaderLines',1);
+
+sur_res =sur(:,9:9+17);
+sim_res =sim(:,4:4+17);
+
 
-figure(1)
-t = tiledlayout('flow');
+mediansur = (mean(log(sur_res)));
+mediansim = (mean(log(sim_res)));
+stdsur = (std(log(sur_res)));
+stdsim = (std(log(sim_res)));
+
+figure(figid+1)
+% t = tiledlayout('flow');
 
 % Team 1
-nexttile([2 5])
+% nexttile([2 5])
 bar([mediansim;mediansur]')
 ylabel("Mean of log EDP")
 grid on;
@@ -22,52 +32,92 @@
 xticks(1:length(names))
 xticklabels(names);
 legend('original','surrogate');
-title('Log-scale')
-set(gca,'fontsize',15)
-fontname("times new roman")
+title('Mean of log EDP')
+% title('Log-scale')
 
-nexttile([2 3])
-bar(exp([mediansim(idPSA);mediansur(idPSA)]'))
-% ylabel("Median PSA")
-ylabel("median PSA")
-grid on;
-set(gcf,'color','w')
-set(gca,'XTickLabel',{names{idPSA}});
-% legend('original','surrogate')
-title("Original scale (PSA)")
-set(gca,'fontsize',15)
-fontname("times new roman")
-
-nexttile([2 2])
-bar(exp([mediansim(idPFD);mediansur(idPFD)]'))
-% ylabel("Median PID")
-ylabel("median PID")
-grid on;
-set(gcf,'color','w')
-set(gca,'XTickLabel',{names{idPFD}});
-% legend('original','surrogate')
-ylabel("median PID")
-title("Original scale (PFD)")
-% ylim([0 6e-3])
 set(gca,'fontsize',15)
 fontname("times new roman")
+% 
+% nexttile([2 3])
+% bar(exp([mediansim(idPSA);mediansur(idPSA)]'))
+% % ylabel("Median PSA")
+% ylabel("median PSA")
+% grid on;
+% set(gcf,'color','w')
+% set(gca,'XTickLabel',{names{idPSA}});
+% % legend('original','surrogate')
+% title("Original scale (PSA)")
+% set(gca,'fontsize',15)
+% fontname("times new roman")
+% 
+% nexttile([2 2])
+% bar(exp([mediansim(idPFD);mediansur(idPFD)]'))
+% % ylabel("Median PID")
+% ylabel("median PID")
+% grid on;
+% set(gcf,'color','w')
+% set(gca,'XTickLabel',{names{idPFD}});
+% % legend('original','surrogate')
+% ylabel("median PID")
+% title("Original scale (PFD)")
+% % ylim([0 6e-3])
+% set(gca,'fontsize',15)
+% fontname("times new roman")
 %%
 
-stdsim = (std(log(sim(:,4:4+7))));
-stdsur = (std(log(sur(:,9:9+7))));
 set(gca,'fontsize',15)
 fontname("times new roman")
 
-figure(2);
+figure(figid+2);
 bar([stdsim;stdsur]')
 ylabel("std[logEDP]")
 grid on;
 set(gcf,'color','w')
-set(gca,'XTickLabel',{"1-PFA-0-1", "1-PFA-0-2", "1-PFA-1-1", "1-PFA-1-2", "1-PFD-1-1", "1-PFD-1-2", "1-PID-1-1", "1-PRD-1-1"});
+xticks(1:length(names))
+xticklabels(names);
 legend('original','surrogate')
 title('Std. of log EDP')
-ylim([0 1.5])
 
 set(gca,'fontsize',15)
 fontname("times new roman")
 
+%%
+
+% figure(4)
+% bar(exp([mediansim(idPID);mediansur(idPID)]'))
+% % ylabel("Median PID")
+% ylabel("median PID")
+% grid on;
+% set(gcf,'color','w')
+% set(gca,'XTickLabel',{names{idPID}});
+% % legend('original','surrogate')
+% ylabel("median PID")
+% title("Original scale (PFD)")
+% % ylim([0 6e-3])
+% set(gca,'fontsize',15)
+% fontname("times new roman")
+
+% 
+% 
+% b = bar([nonlinearPID, linearPID],'FaceColor','flat');
+% % ylabel("Median PID")
+% ylabel("median PID")
+% grid on;
+% set(gcf,'color','w')
+% set(gca,'XTickLabel',{names{idPID}});
+% % legend('original','surrogate')
+% ylabel("median PID")
+% title("Original scale (PFD)")
+% % ylim([0 6e-3])
+% set(gca,'fontsize',15)
+% fontname("times new roman")
+% 
+% 
+% 
+% b(1).CData = 	[0.8 0  0.2];
+% b(2).CData = 	[0.6 0  0.2];
+% b(3).CData = 	[0 0.8 0.2];
+% b(4).CData = 	[0 0.6 0.2];
+% legend('linear-original','linear-surrogate','nonlinear-original','nonlinear-surrogate')
+% 
+