Skip to content

Fixing bugs on calculating consequence #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Xiang-Zeng wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixing bugs on calculating consequence #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a0247a
fixing bug on writing EDP values
Xiang-Zeng Jan 27, 2018
e619b6e
fixing bug on calculating consequence
Xiang-Zeng Feb 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion createDL/HazusLossEstimator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ double HazusLossEstimator::_SimulateConseq(double q, double q_total,const Fragil


//reducing standard deviation
for(int i=0;i<q;i++){
for(int i=0;i<(int)q;i++){
if(curve->curve_type==FragilityCurve::lognormal)
conseq+=exp(stat->gaussrand(log(median),dispersion));
else //normal distribution
Expand Down
2 changes: 1 addition & 1 deletion performSIMULATION/OpenSeesPostprocessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ OpenSeesPostprocessor::processEDPs(){
if (abs2Value > abs1Value)
abs1Value = abs2Value;

json_object_set(response,"scalar_data",json_real(abs2Value));
json_object_set(response,"scalar_data",json_real(abs1Value));

} else if (strcmp(type,"max_drift") == 0) {

Expand Down