Skip to content

Bug fixes #113

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
longchen-geo wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Bug fixes #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d073cf4
Merge pull request #1 from NHERI-SimCenter/master
longchen-geo Oct 7, 2020
8b22a3c
Bug fixes.
longchen-geo Oct 7, 2020
8abf060
Fix a bug in Ru
longchen-geo Oct 12, 2020
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
16 changes: 8 additions & 8 deletions SiteResponse/EffectiveFEModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1314,7 +1314,7 @@ int SiteResponseModel::buildEffectiveStressModel2D(bool doAnalysis)
theDomain->addRecorder(*theRecorder);
}


s << "file mkdir out_tcl" << endln;
s << "set recDT " << recDT << endln;
s<< "eval \"recorder Node -file out_tcl/surface.disp -time -dT $recDT -node "<<numNodes<<" -dof 1 2 3 disp\""<<endln;// 1 2
s<< "eval \"recorder Node -file out_tcl/surface.acc -time -dT $recDT -node "<<numNodes<<" -dof 1 2 3 accel\""<<endln;// 1 2
Expand Down Expand Up @@ -2571,8 +2571,8 @@ int SiteResponseModel::buildEffectiveStressModel3D(bool doAnalysis)
s << "analysis Transient" << endln << endln;
*/

double gamma = 0.5;
double beta = 0.25;
double gamma = 0.8333;// 5./6.;
double beta = 0.4444;//4./9.;
s << "set gamma " << gamma << endln;
s << "set beta " << beta << endln;
s << "constraints Penalty 1.e14 1.e14" << endln;
Expand Down Expand Up @@ -3077,9 +3077,9 @@ int SiteResponseModel::buildEffectiveStressModel3D(bool doAnalysis)
theDomain->setCurrentTime(0.0);


//s << "set gamma_dynm " << gamma_dynm << endln;
//s << "set beta_dynm " << beta_dynm << endln;
//s << "integrator Newmark $gamma_dynm $beta_dynm" << endln;
s << "set gamma_dynm " << gamma_dynm << endln;
s << "set beta_dynm " << beta_dynm << endln;
s << "integrator Newmark $gamma_dynm $beta_dynm" << endln;
//s << "set a0 " << a0 << endln;
//s << "set a1 " << a1 << endln;
//s << "rayleigh $a0 $a1 0.0 0.0" << endln;
Expand All @@ -3103,7 +3103,7 @@ int SiteResponseModel::buildEffectiveStressModel3D(bool doAnalysis)
s << "numberer Plain ;#same with cpp"<<endln;
s << "#system SparseGeneral"<<endln;
s << "system BandGeneral ;#same with cpp"<<endln;
s << "integrator Newmark $gamma $beta"<<endln;
// s << "integrator Newmark $gamma $beta"<<endln;
s << "#rayleigh $a0 $a1 0.0 0.0"<<endln;
s << "analysis Transient"<<endln;

Expand Down Expand Up @@ -3150,7 +3150,7 @@ int SiteResponseModel::buildEffectiveStressModel3D(bool doAnalysis)
theRecorder = new NodeRecorder(dofToRecord, &nodesToRecord, 0, "disp", *theDomain, *theOutputStream, motionDT, true, NULL);
theDomain->addRecorder(*theRecorder);
}

s << "file mkdir out_tcl" << endln;
double recDT = motionDT;
s << "set recDT " << recDT << endln;
s<< "eval \"recorder Node -file out_tcl/surface.disp -time -dT $recDT -node "<<numNodes<<" -dof 1 2 3 disp\""<<endln;// 1 2
Expand Down
4 changes: 2 additions & 2 deletions UI/PostProcessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,7 @@ void PostProcessor::calcRu()
if (m_ru.size()>0)
m_ru.clear();
for(int i=0;i<v.size();i++)
m_ru.append( v[i] * 100 );
m_ru.append( v[i] );



Expand Down Expand Up @@ -1012,7 +1012,7 @@ void PostProcessor::calcRupwp()
if (m_rupwp.size()>0)
m_rupwp.clear();
for(int i=0;i<v.size();i++)
m_rupwp.append( v[i] * 100 );
m_rupwp.append( v[i] );

if (m_initialStress.size()>0)
m_initialStress.clear();
Expand Down
2 changes: 1 addition & 1 deletion UI/ProfileManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ void ProfileManager::updaterupwpHtml()
stream << "]; \n";
stream << "yd = ['Rupwp',NaN";
for (int i=0;i<rupwp.size();i++)
stream << ", " << rupwp[i]/100.0;
stream << ", " << rupwp[i];
stream << ",NaN]; \n";
text.replace(QString("//UPDATEPOINT"), insertedString);

Expand Down
4 changes: 2 additions & 2 deletions UI/TabManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,8 +655,8 @@ void TabManager::writeGM()
for(int j=0;j<tV.size();j++)
streamTime << QString::number(tV[j].toDouble())+"\n";
for(int j=0;j<data.size();j++)
stream << data[j].toString()+"\n";
//stream << QString::number(data[j].toDouble(),'g',16)+"\n";
//stream << data[j].toString()+"\n";
stream << QString::number(data[j].toDouble(),'g',16)+"\n";

outFile.close();
outFileTime.close();
Expand Down