suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FEM: code formating, white spaces

Browse Source
This commit is contained in:
Bernd Hahnebach 2017-02-16 07:54:43 +01:00
parent b55a7688cc
commit 17eac77144
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -266,11 +266,11 @@ private:
FemVTKTools::readResult(EncodedName.c_str(), obj);
}
else
FemVTKTools::readResult(EncodedName.c_str()); //assuming activeObject can hold Result
FemVTKTools::readResult(EncodedName.c_str()); // assuming activeObject can hold Result
return Py::None();
}
Py::Object writeResult(const Py::Tuple& args)
{
char* fileName = NULL;

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

@ -258,7 +258,7 @@ void FemPostPipeline::load(FemResultObject* res) {
//Now copy the point data over
//############################
if(res->getPropertyByName("Velocity")){ // consider better way to detect result type, res->Type == "CfdResult"
if(res->getPropertyByName("Velocity")){ // TODO: consider better way to detect result type, res->Type == "CfdResult"
FemVTKTools::exportFluidicResult(res, grid);
}
else{

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

@ -42,7 +42,7 @@ FemResultObject::FemResultObject()
ADD_PROPERTY_TYPE(NodeNumbers,(0), "Data",Prop_None,"Numbers of the result nodes");
ADD_PROPERTY_TYPE(Stats,(0), "Fem",Prop_None,"Statistics of the results");
ADD_PROPERTY_TYPE(Time,(0), "Fem",Prop_None,"Time of analysis incement");
/*
ADD_PROPERTY_TYPE(DisplacementVectors,(), "Fem",Prop_None,"List of displacement vectors");
ADD_PROPERTY_TYPE(DisplacementLengths,(0), "Fem",Prop_None,"List of displacement lengths");
@ -77,7 +77,7 @@ FemResultObject::FemResultObject()
Eigenmode.setStatus(App::Property::ReadOnly, true);
EigenmodeFrequency.setStatus(App::Property::ReadOnly, true);
UserDefined.setStatus(App::Property::ReadOnly, false);
* */
*/
}
FemResultObject::~FemResultObject()

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

@ -128,7 +128,7 @@ void FemVTKTools::importVTKMesh(vtkSmartPointer<vtkDataSet> dataset, FemMesh* me
meshds->ClearMesh();
for(vtkIdType i=0; i<nPoints; i++)
{
{
double* p = dataset->GetPoint(i);
meshds->AddNodeWithID(p[0]*scale, p[1]*scale, p[2]*scale, i+1);
}
@ -491,7 +491,7 @@ App::DocumentObject* FemVTKTools::readResult(const char* filename, App::Document
Base::TimeInfo Start;
Base::Console().Log("Start: read FemResult with FemMesh from VTK file ======================\n");
Base::FileInfo f(filename);
auto hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Units");
int unitSchema = hGrp->GetInt("UserSchema",0);
float scale = 1.0;
@ -544,7 +544,7 @@ App::DocumentObject* FemVTKTools::readResult(const char* filename, App::Document
static_cast<PropertyFemMesh*>(mesh->getPropertyByName("FemMesh"))->setValue(*fmesh);
static_cast<App::PropertyLink*>(result->getPropertyByName("Mesh"))->setValue(mesh);
// PropertyLink is the property type to store DocumentObject pointer
vtkSmartPointer<vtkPointData> pd = dataset->GetPointData();
vtkSmartPointer<vtkDataArray> displ = pd->GetArray("Displacement"); // name in vtk file, not the property name
vtkSmartPointer<vtkDataArray> vel = pd->GetArray("U"); // name in vtk file, not the property name
@ -638,14 +638,14 @@ void _calcStat(const std::vector<Base::Vector3d>& vel, std::vector<double>& stat
double vmag = std::sqrt(p[0]*p[0] + p[1]*p[1] + p[2]*p[2]);
for(int ii=0; ii<3; ii++) {
vmeans[ii] += p[ii];
if(p[ii] > vmaxs[ii]) vmaxs[ii] = p[ii];
if(p[ii] < vmins[ii]) vmins[ii] = p[ii];
if(p[ii] > vmaxs[ii]) vmaxs[ii] = p[ii];
if(p[ii] < vmins[ii]) vmins[ii] = p[ii];
}
vmean += vmag;
if(vmag > vmax) vmax = vmag;
if(vmag < vmin) vmin = vmag;
}
for(int ii=0; ii<3; ii++) {
stats[ii*3] = vmins[ii];
stats[ii*3 + 2] = vmaxs[ii];
@ -657,7 +657,7 @@ void _calcStat(const std::vector<Base::Vector3d>& vel, std::vector<double>& stat
stats[index*3 + 1] = vmean/nPoints;
}
void _importResult(const vtkSmartPointer<vtkDataSet> dataset, App::DocumentObject* res,
void _importResult(const vtkSmartPointer<vtkDataSet> dataset, App::DocumentObject* res,
const std::map<std::string, std::string>& vectors, const std::map<std::string, std::string> scalers,
const std::map<std::string, int> varids, const std::string& essential_property){
const int max_var_index = 11;
@ -715,7 +715,7 @@ void _importResult(const vtkSmartPointer<vtkDataSet> dataset, App::DocumentObjec
}
else {
Base::Console().Error("static_cast<App::PropertyVectorList*>((res->getPropertyByName(\"%s\")) failed \n", kv.first.c_str());
continue;
continue;
}
}