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

FEM: Typo residuals

Browse Source
This commit is contained in:
luzpaz
2017-12-31 12:19:24 -05:00
committed by wmayer
parent c121e76f1e
commit f6edbbdc5a
12 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1420,7 +1420,7 @@ void FemMesh::writeABAQUS(const std::string &Filename, int elemParam, bool group
default:
anABAQUS_Output << "** Problem on writing" << std::endl;
anABAQUS_Output.close();
throw std::runtime_error("Not known ABAQUS element choice parameter, [0|1|2] are allowed.");
throw std::runtime_error("Unknown ABAQUS element choice parameter, [0|1|2] are allowed.");
}
// write nodes

4
src/Mod/Fem/App/FemVTKTools.cpp
View File

@@ -844,7 +844,7 @@ void FemVTKTools::importFluidicResult(vtkSmartPointer<vtkDataSet> dataset, App::
std::map<std::string, std::string> cfd_vectors; // vector field defined in openfoam -> property defined in CfdResult.py
cfd_vectors["Velocity"] = "U";
std::map<std::string, std::string> cfd_scalers; // varable name defined in openfoam -> property defined in CfdResult.py
std::map<std::string, std::string> cfd_scalers; // variable name defined in openfoam -> property defined in CfdResult.py
cfd_scalers["Pressure"] = "p";
cfd_scalers["Temperature"] = "T";
cfd_scalers["TurbulenceEnergy"] = "k";
@@ -877,7 +877,7 @@ void FemVTKTools::exportFluidicResult(const App::DocumentObject* res, vtkSmartPo
static std::map<std::string, std::string> cfd_vectors; // vector field defined in openfoam -> property defined in CfdResult.py
cfd_vectors["Velocity"] = "U";
static std::map<std::string, std::string> cfd_scalers; // varable name defined in openfoam -> property defined in CfdResult.py
static std::map<std::string, std::string> cfd_scalers; // variable name defined in openfoam -> property defined in CfdResult.py
cfd_scalers["Pressure"] = "p";
cfd_scalers["Temperature"] = "T";
cfd_scalers["TurbulenceEnergy"] = "k";

2
src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.h
View File

@@ -98,7 +98,7 @@ private:
private:
Ui_TaskFemConstraintFluidBoundary* ui;
int dimension; // -1: unknow, 2 for 2D and 3 for 3D
int dimension; // -1: unknown, 2 for 2D and 3 for 3D
Fem::FemSolverObject* pcSolver;
App::PropertyBool* pHeatTransfering;
App::PropertyEnumeration* pTurbulenceModel;

2
src/Mod/Fem/Gui/ViewProviderFemMesh.h
View File

@@ -93,7 +93,7 @@ public:
/// return a hit element to the selection path or 0
virtual std::string getElement(const SoDetail*) const;
virtual SoDetail* getDetail(const char*) const;
/// return the higlight lines for a given element or the whole shape
/// return the highlight lines for a given element or the whole shape
virtual std::vector<Base::Vector3d> getSelectionShape(const char* Element) const;
//@}

10
src/Mod/Fem/Gui/ViewProviderFemMeshPy.xml
View File

@@ -32,31 +32,31 @@
</Methode>
<Attribute Name="NodeColor" ReadOnly="false">
<Documentation>
<UserDocu>Postprocessing color of the nodes. The faces between the nodes gets interpolated. </UserDocu>
<UserDocu>Postprocessing color of the nodes. The faces between the nodes get interpolated.</UserDocu>
</Documentation>
<Parameter Name="NodeColor" Type="Dict"/>
</Attribute>
<Attribute Name="ElementColor" ReadOnly="false">
<Documentation>
<UserDocu>Postprocessing color of the elements. All faces of the element get the same color. </UserDocu>
<UserDocu>Postprocessing color of the elements. All faces of the element get the same color.</UserDocu>
</Documentation>
<Parameter Name="ElementColor" Type="Dict"/>
</Attribute>
<Attribute Name="NodeDisplacement" ReadOnly="false">
<Documentation>
<UserDocu>Postprocessing color of the the nodes. The faces between the nodes gets interpolated. </UserDocu>
<UserDocu>Postprocessing color of the nodes. The faces between the nodes get interpolated.</UserDocu>
</Documentation>
<Parameter Name="NodeDisplacement" Type="Dict"/>
</Attribute>
<Attribute Name="HighlightedNodes" ReadOnly="false">
<Documentation>
<UserDocu>List of nodes which gets highlighted</UserDocu>
<UserDocu>List of nodes which get highlighted.</UserDocu>
</Documentation>
<Parameter Name="HighlightedNodes" Type="List"/>
</Attribute>
<Attribute Name="VisibleElementFaces" ReadOnly="true">
<Documentation>
<UserDocu>A List of elements and faces which are actually shown. This are all surface faces of the mesh</UserDocu>
<UserDocu>List of elements and faces which are actually shown. These are all surface faces of the mesh.</UserDocu>
</Documentation>
<Parameter Name="VisibleElementFaces" Type="List"/>
</Attribute>

2
src/Mod/Fem/Gui/ViewProviderFemPostObject.h
View File

@@ -112,7 +112,7 @@ public:
// /// return a hit element to the selection path or 0
// virtual std::string getElement(const SoDetail*) const;
// virtual SoDetail* getDetail(const char*) const;
// /// return the higlight lines for a given element or the whole shape
// /// return the highlight lines for a given element or the whole shape
// virtual std::vector<Base::Vector3d> getSelectionShape(const char* Element) const;
// //@}

2
src/Mod/Fem/PyGui/_ViewProviderFemSolverCalculix.py
View File

@@ -281,7 +281,7 @@ class _TaskPanelFemSolverCalculix:
fea.update_objects()
message = fea.check_prerequisites()
if message != "":
QtGui.QMessageBox.critical(None, "Missing prerequisit(s)", message)
QtGui.QMessageBox.critical(None, "Missing prerequisite(s)", message)
return False
return True

2
src/Mod/Fem/feminout/convert2TetGen.py
View File

@@ -147,7 +147,7 @@ def createMesh():
beVerbose = 1
if beVerbose == 1:
FreeCAD.Console.PrintMessage("\n\n\n\n\n\n\n\nScript starts...")
## Geometry defenition
## Geometry definition
# Define objects names
PyDocumentName = "pnJunction"
PSideBoxName = "PSide"

4
src/Mod/Fem/feminout/importZ88Mesh.py
View File

@@ -290,9 +290,9 @@ def read_z88_mesh(z88_mesh_input):
nd11, nd12, nd13, nd14, nd15, nd16, nd17, nd18, nd19, nd20)
input_continues = False
# not known elements, some example have -1 for some teaching reasons to show some other stuff
# unknown elements, some examples have -1 for some teaching reasons to show some other stuff
else:
FreeCAD.Console.PrintError("Not known element\n")
FreeCAD.Console.PrintError("Unknown element\n")
return {}
if Debug:

2
src/Mod/Fem/femmesh/meshtools.py
View File

@@ -324,7 +324,7 @@ def get_femvolumeelements_by_femfacenodes(femelement_table, node_list):
if nodecount == 6 or nodecount == 8:
e.append(elementID)
else:
FreeCAD.Console.PrintError('Error in get_femvolumeelements_by_femfacenodes(): not known volume element: ' + el_nd_ct + '\n')
FreeCAD.Console.PrintError('Error in get_femvolumeelements_by_femfacenodes(): unknown volume element: ' + el_nd_ct + '\n')
# print(sorted(e))
return e

4
src/Mod/Fem/femsolver/calculix/writer.py
View File

@@ -1001,7 +1001,7 @@ class FemInputWriterCcx(FemInputWriter.FemInputWriter):
for line in lines:
b = line.split(',')
if int(b[0]) == n and b[3] == 'PIPE INLET\n':
f.write(b[1] + ',1,1,' + str(fluidsection_obj.InletFlowRate * 0.001) + '\n') # degree of freedom 1 is for defining flow rate, factor applied to convet unit from kg/s to t/s
f.write(b[1] + ',1,1,' + str(fluidsection_obj.InletFlowRate * 0.001) + '\n') # degree of freedom 1 is for defining flow rate, factor applied to convert unit from kg/s to t/s
elif fluidsection_obj.LiquidSectionType == 'PIPE OUTLET':
f.write('**Fluid Section Outlet \n')
if fluidsection_obj.OutletPressureActive is True:
@@ -1017,7 +1017,7 @@ class FemInputWriterCcx(FemInputWriter.FemInputWriter):
for line in lines:
b = line.split(',')
if int(b[0]) == n and b[3] == 'PIPE OUTLET\n':
f.write(b[1] + ',1,1,' + str(fluidsection_obj.OutletFlowRate * 0.001) + '\n') # degree of freedom 1 is for defining flow rate, factor applied to convet unit from kg/s to t/s
f.write(b[1] + ',1,1,' + str(fluidsection_obj.OutletFlowRate * 0.001) + '\n') # degree of freedom 1 is for defining flow rate, factor applied to convert unit from kg/s to t/s
def write_outputs_types(self, f):
f.write('\n***********************************************************\n')

2
src/Mod/Fem/femtest/testfemcommon.py
View File

@@ -1310,7 +1310,7 @@ update the results of FEM unit tests:
import TestFem
TestFem.create_test_results()
copy result files from your_temp_directory/FEM_unittests/ test directories into the src dirctory
copy result files from your_temp_directory/FEM_unittests/ test directories into the src directory
compare the results with git difftool
run make
start FreeCAD and run FEM unit test