kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

FEM: remove trailing whitespace from various FEM files

Browse Source
This commit is contained in:
luz paz
2022-08-07 16:23:24 -04:00
committed by Uwe
parent ee127273c1
commit feb4218d06
7 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Fem/App/FemAnalysis.h
View File

@@ -33,7 +33,7 @@ namespace Fem {
/**
* @brief Container of objects relevant to one simulation.
*
*
* @details
* A Analysis contains all objects necessary for a complete specification
* of a simulation. After computing it also contains the result of the

26
src/Mod/Fem/App/FemMesh.cpp
View File

@@ -1674,7 +1674,7 @@ void FemMesh::readNastran95(const std::string &Filename)
node = std::make_shared<GRIDNastran95Element>();
node->read(line1, "");
}
//1D
else if (line1.substr(0,6)=="CBAR")
{
@@ -1699,40 +1699,40 @@ void FemMesh::readNastran95(const std::string &Filename)
else if (line1.substr(0, 6) == "CQUAD1")
{
//D06
//CTRMEM 322 1 179 180 185
//CTRMEM 322 1 179 180 185
elem = std::make_shared<CQUAD1Element>();
elem->read(line1, "");
}
//3d element
else if (line1.find("CTETRA")!= std::string::npos)
{
//d011121a.inp
//CTETRA 3 200 104 114 3 103
//d011121a.inp
//CTETRA 3 200 104 114 3 103
elem = std::make_shared<CTETRANastran95Element>();
elem->read(line1, "");
}
else if (line1.find("CWEDGE")!= std::string::npos)
{
//d011121a.inp
//CWEDGE 11 200 6 17 16 106 117 116
//d011121a.inp
//CWEDGE 11 200 6 17 16 106 117 116
elem = std::make_shared<CTETRANastran95Element>();
elem->read(line1, "");
}
else if (line1.find("CHEXA1")!= std::string::npos)
{
//d011121a.inp
//CHEXA1 1 200 1 2 13 12 101 102 +SOL1
//+SOL1 113 112
//d011121a.inp
//CHEXA1 1 200 1 2 13 12 101 102 +SOL1
//+SOL1 113 112
std::getline(inputfile,line2);
elem = std::make_shared<CHEXA1Element>();
elem->read(line1, line2);
}
else if (line1.find("CHEXA2")!= std::string::npos)
{
//d011121a.inp
//CHEXA1 1 200 1 2 13 12 101 102 +SOL1
//+SOL1 113 112
//d011121a.inp
//CHEXA1 1 200 1 2 13 12 101 102 +SOL1
//+SOL1 113 112
std::getline(inputfile,line2);
elem = std::make_shared<CHEXA2Element>();
elem->read(line1, line2);

2
src/Mod/Fem/App/FemPostFilter.cpp
View File

@@ -79,7 +79,7 @@ DocumentObjectExecReturn* FemPostFilter::execute(void) {
}
else {
pipe.source->SetInputDataObject(getInputData());
pipe.target->Update();
pipe.target->Update();
Data.setValue(pipe.target->GetOutputDataObject(0));
}

2
src/Mod/Fem/App/FemPostPipeline.cpp
View File

@@ -120,7 +120,7 @@ bool FemPostPipeline::canRead(Base::FileInfo File) {
File.hasExtension("vtr") ||
File.hasExtension("vti") ||
File.hasExtension("vtu") ||
File.hasExtension("pvtu"))
File.hasExtension("pvtu"))
return true;
return false;

6
src/Mod/Fem/Gui/Command.cpp
View File

@@ -1199,7 +1199,7 @@ void setupFilter(Gui::Command* cmd, std::string Name) {
cmd->doCommand(Gui::Command::Doc, "__list__.append(App.ActiveDocument.%s)", FeatName.c_str());
cmd->doCommand(Gui::Command::Doc, "App.ActiveDocument.%s.Filter = __list__", pipeline->getNameInDocument());
cmd->doCommand(Gui::Command::Doc, "del __list__");
// set display to assure the user sees the new object
cmd->doCommand(Gui::Command::Doc, "App.activeDocument().ActiveObject.ViewObject.DisplayMode = \"Surface\"");
// Set SelectionStyle to BoundBox because the idea is that the user gets the useful result
@@ -1219,7 +1219,7 @@ void setupFilter(Gui::Command* cmd, std::string Name) {
}
std::string Plot()
std::string Plot()
{
auto xAxisLabel = QCoreApplication::translate("CmdFemPostLinearizedStressesFilter", "Thickness [mm]", "Plot X-Axis Label").toStdString();
auto yAxisLabel = QCoreApplication::translate("CmdFemPostLinearizedStressesFilter", "Stress [MPa]", "Plot Y-Axis Label").toStdString();
@@ -1495,7 +1495,7 @@ void CmdFemPostLinearizedStressesFilter::activated(int)
// names need to match with names in FemVTKTools.cpp, this is not failsafe, but ATM there is no better way for test on a stress result in vtk pipeline
) {
// TODO FIXME only works if the data along the line object has the name DataAlongLine
// we should get the selected data along the line object
// we should get the selected data along the line object
App::DocumentObjectT objT(DataAlongLine);
std::string ObjName = objT.getObjectPython();
Gui::doCommandT(Gui::Command::Doc, "t_coords = %s.XAxisData", ObjName);

4
src/Mod/Fem/Gui/TaskFemConstraintContact.cpp
View File

@@ -94,12 +94,12 @@ TaskFemConstraintContact::TaskFemConstraintContact(ViewProviderFemConstraintCont
// QMessageBox::warning(this, tr("Objects.size"), QString::number(Objects.size()));
if (Objects.size() == 1) {
QMessageBox::warning(this, tr("Selection error"), tr("Only one face in object! - moved to master face"));
QMessageBox::warning(this, tr("Selection error"), tr("Only one face in object! - moved to master face"));
ui->lw_referencesMaster->addItem(makeRefText(Objects[0], SubElements[0]));
}
if (Objects.size() == 2 ) {
ui->lw_referencesMaster->addItem(makeRefText(Objects[1], SubElements[1]));
ui->lw_referencesMaster->addItem(makeRefText(Objects[1], SubElements[1]));
ui->lw_referencesSlave->addItem(makeRefText(Objects[0], SubElements[0]));
}

6
src/Mod/Fem/Gui/TaskPostBoxes.cpp
View File

@@ -436,7 +436,7 @@ void TaskPostDisplay::applyPythonCode() {
// ***************************************************************************
// ?
// the icon fem-post-geo-plane might be wrong but I do not know any better since the plane is one of the implicit functions
TaskPostFunction::TaskPostFunction(ViewProviderDocumentObject* view, QWidget* parent)
TaskPostFunction::TaskPostFunction(ViewProviderDocumentObject* view, QWidget* parent)
: TaskPostBox(view, Gui::BitmapFactory().pixmap("fem-post-geo-plane"), tr("Implicit function"), parent)
{
@@ -1101,7 +1101,7 @@ void TaskPostDataAtPoint::on_Field_activated(int i) {
static_cast<Fem::FemPostDataAtPointFilter*>(getObject())->FieldName.setValue(FieldName);
// Set the unit for the different known result types.
// CCX names
if ( (FieldName == "von Mises Stress") || (FieldName == "Tresca Stress")
|| (FieldName == "Major Principal Stress") || (FieldName == "Minor Principal Stress")
@@ -1214,7 +1214,7 @@ TaskPostScalarClip::TaskPostScalarClip(ViewProviderDocumentObject* view, QWidget
// sync the slider
// slider min = 0%, slider max = 100%
//
// scalar_factor
// scalar_factor
// slider_value = --------------- x 100
// max
//