Bugfix for Issue #1, finished changing variable name from Sa_calc to …

…SaCalc. Other minor documentation updates.

M2_M3_Main_Run_All.m

@@ -269,10 +269,6 @@
     EDP = importdata(['Data/' EDPname struc '.mat']);
     RD_c  = mu_RD_c(l);
 
-%     [Sas(:,l), EDPs(:,:,l), pd_Cs(:,l), paramNCs(:,:,l), ...
-%         fragSs(:,:,:,l), DamageProbs(:,:,:,l), ...
-%         Sa_calc, EL_PPs(:,:,l), EL_PP_cases(:,l), EAL_S(:,l),...
-%         EAL_NS(:,l), EAL_C(:,l)] = M2_PBEE_Simple_Orig(struc, RD_c, Years);
     [Sas(:,l), EDPs(:,:,l), pd_Cs(:,l), paramNCs(:,:,l), ...
         fragSs(:,:,:,l), DamageProbs(:,:,:,l), ...
         EL_PPs(:,:,l), EL_PP_cases(:,l), EAL_S(:,l),...
@@ -956,13 +952,13 @@
     Lstyle = Lstyles{l};
     for k = 1:numPP % PP types
         for kk = 1:numDS
-            M2_Plot_Fragility(xlims(kk,:),Sa_calc,...
-                reshape(fragSs(:,kk,PPcols(l,:),l),length(Sa_calc),3),...
+            M2_Plot_Fragility(xlims(kk,:),SaCalc,...
+                reshape(fragSs(:,kk,PPcols(l,:),l),length(SaCalc),3),...
                 Lstyle, colors(k,:), DSnames{kk},...
                 [PPnames{k}, num2str(RD_c)],struc,true,true,true)
         end
-        M2_Plot_Fragility(xlims(numDS+1,:),Sa_calc,...
-            reshape(DamageProbs(:,numDS+1,PPcols(l,:),l),length(Sa_calc),3),...
+        M2_Plot_Fragility(xlims(numDS+1,:),SaCalc,...
+            reshape(DamageProbs(:,numDS+1,PPcols(l,:),l),length(SaCalc),3),...
             Lstyle, colors(k,:), DSnames{5},...
             [PPnames{k},num2str(RD_c)],struc,true,true,true)
     end

M2_Push2SDOF_concrete_normalized.m

@@ -1,4 +1,5 @@
-%this script trasnform a pushover curve to a trilinear SDOF backbone
+% Transforms a pushover curve to a trilinear SDOF backbone
+% written by Mohsen Zaker-Esteghamati
 clear
 clc
 pushdata=csvread('4story_concrete.csv');

M2_Push2SDOF_steel.m

@@ -1,4 +1,5 @@
-%this script trasnform a pushover curve to a trilinear SDOF backbone
+% Transforms a pushover curve to a trilinear SDOF backbone
+% written by Mohsen Zaker-Esteghamati
 clear
 clc
 pushdata=csvread('4story_steel.csv');
@@ -18,7 +19,7 @@
 PushArea=trapz(xArea,yArea);
 %% 
 
-%to get the linear part slop
+%to get the linear part slope
 k=(2*pi/1.32)^2;
 Fy=max(pushdata(:,2));
 

README.md

@@ -429,7 +429,7 @@ Scripts are named according to their module of application, M1, M2, or M3. Data
 
 ## Credits and Sources
 * M1: [Haseeb Tahir, MS Thesis (2016), Virginia Tech](http://hdl.handle.net/10919/71794)
-* M1: DesignSafe repository for Tahir
+* M1:[Seismic, Hurricane, and Tsunami Vulnerability Database and Pinch-Point Taxonomy for Mid-Rise Commercial Buildings Repository](https://doi.org/10.17603/ds2-09nn-ze82)
 * M1/M2: [USGS Unified Hazard Tool](https://earthquake.usgs.gov/hazards/interactive/)
 * M2: [Charleston, SC hazard and GM package](http://www.magma.geos.vt.edu/vtso/anonftp/scdot/report-FWHA-SC-06-09.pdf)
 * M2: special moment-resisting frames from Blume Center Technical Reports: concrete from [Haselton and Deierlein (2007)](http://purl.stanford.edu/ny266sf1883); steel from [Lignos and Krawinkler (2012)](http://purl.stanford.edu/yg701cw5473)