[asl] 43/177: Renaming Surf -> Surface
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Thu Aug 27 09:22:37 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository asl.
commit e195be0f958d3b6ba63dd6b4750687d347bb7b42
Author: AvtechScientific <AvtechScientific at users.noreply.github.com>
Date: Sun Jun 21 14:56:17 2015 +0300
Renaming Surf -> Surface
---
src/readers/aslVTKFormatReaders.cxx | 166 +++++++++++++-------------
src/readers/aslVTKFormatReaders.h | 24 ++--
test/testAGL/testVTK_IO.cc | 10 +-
test/testPhysics/flow/bus_wind.cc | 2 +-
test/testPhysics/flow/compressor.cc | 4 +-
test/testPhysics/flow/flowAroundObject.cc | 8 +-
test/testPhysics/flow/locomotive_in_tunnel.cc | 8 +-
test/testPhysics/flow/locomotive_stability.cc | 2 +-
8 files changed, 112 insertions(+), 112 deletions(-)
diff --git a/src/readers/aslVTKFormatReaders.cxx b/src/readers/aslVTKFormatReaders.cxx
index 330dabe..aa39502 100644
--- a/src/readers/aslVTKFormatReaders.cxx
+++ b/src/readers/aslVTKFormatReaders.cxx
@@ -129,9 +129,9 @@ namespace asl
return data;
}
- SPDataWithGhostNodesACLData surfToData(vtkDataSet* surf,
- double dx,
- acl::CommandQueue queue)
+ SPDataWithGhostNodesACLData surfaceToData(vtkDataSet* surf,
+ double dx,
+ acl::CommandQueue queue)
{
vtkSmartPointer<vtkImplicitModeller> modeller(vtkSmartPointer<vtkImplicitModeller>::New());
modeller->SetOutputScalarTypeToFloat();
@@ -152,9 +152,9 @@ namespace asl
return data;
}
- SPDataWithGhostNodesACLData surfToData(vtkDataSet* surf,
- Block & b,
- acl::CommandQueue queue)
+ SPDataWithGhostNodesACLData surfaceToData(vtkDataSet* surf,
+ Block & b,
+ acl::CommandQueue queue)
{
vtkSmartPointer<vtkImplicitModeller> modeller(vtkSmartPointer<vtkImplicitModeller>::New());
modeller->SetOutputScalarTypeToFloat();
@@ -182,12 +182,12 @@ namespace asl
return data;
}
- SPDataWithGhostNodesACLData surfToData(vtkDataSet* surf,
- double dx,
- double offset_X0, double offset_XE,
- double offset_Y0, double offset_YE,
- double offset_Z0, double offset_ZE,
- acl::CommandQueue queue)
+ SPDataWithGhostNodesACLData surfaceToData(vtkDataSet* surf,
+ double dx,
+ double offset_X0, double offset_XE,
+ double offset_Y0, double offset_YE,
+ double offset_Z0, double offset_ZE,
+ acl::CommandQueue queue)
{
vtkSmartPointer<vtkImplicitModeller> modeller(vtkSmartPointer<vtkImplicitModeller>::New());
modeller->SetOutputScalarTypeToFloat();
@@ -216,97 +216,97 @@ namespace asl
}
- SPDataWithGhostNodesACLData readSurfVTKXML(const string & fileName,
- double dx,
- acl::CommandQueue queue)
+ SPDataWithGhostNodesACLData readSurfaceVTKXML(const string & fileName,
+ double dx,
+ acl::CommandQueue queue)
{
vtkSmartPointer<vtkXMLPolyDataReader> reader(vtkSmartPointer<vtkXMLPolyDataReader>::New());
if (!reader->CanReadFile(fileName.c_str()))
- errorMessage("SurfVTKXML reader: The input file is corrupted or file name is wrong: " + fileName);
+ errorMessage("SurfaceVTKXML reader: The input file is corrupted or file name is wrong: " + fileName);
reader->SetFileName(fileName.c_str());
reader->Update();
- return surfToData(reader->GetOutput(),dx,queue);
+ return surfaceToData(reader->GetOutput(),dx,queue);
}
- SPDataWithGhostNodesACLData readSurfVTKXML(const string & fileName,
- Block & b,
- acl::CommandQueue queue)
+ SPDataWithGhostNodesACLData readSurfaceVTKXML(const string & fileName,
+ Block & b,
+ acl::CommandQueue queue)
{
vtkSmartPointer<vtkXMLPolyDataReader> reader(vtkSmartPointer<vtkXMLPolyDataReader>::New());
if (!reader->CanReadFile(fileName.c_str()))
- errorMessage("SurfVTKXML reader: The input file is corrupted or file name is wrong: " + fileName);
+ errorMessage("SurfaceVTKXML reader: The input file is corrupted or file name is wrong: " + fileName);
reader->SetFileName(fileName.c_str());
reader->Update();
- return surfToData(reader->GetOutput(),b,queue);
+ return surfaceToData(reader->GetOutput(),b,queue);
}
- SPDataWithGhostNodesACLData readSurfVTKXML(const string & fileName,
- double dx,
- double offset_X0, double offset_XE,
- double offset_Y0, double offset_YE,
- double offset_Z0, double offset_ZE,
- acl::CommandQueue queue)
+ SPDataWithGhostNodesACLData readSurfaceVTKXML(const string & fileName,
+ double dx,
+ double offset_X0, double offset_XE,
+ double offset_Y0, double offset_YE,
+ double offset_Z0, double offset_ZE,
+ acl::CommandQueue queue)
{
vtkSmartPointer<vtkXMLPolyDataReader> reader(vtkSmartPointer<vtkXMLPolyDataReader>::New());
if (!reader->CanReadFile(fileName.c_str()))
- errorMessage("SurfVTKXML reader: The input file is corrupted or file name is wrong: " + fileName);
+ errorMessage("SurfaceVTKXML reader: The input file is corrupted or file name is wrong: " + fileName);
reader->SetFileName(fileName.c_str());
reader->Update();
- return surfToData(reader->GetOutput(),
- dx,
- offset_X0, offset_XE,
- offset_Y0, offset_YE,
- offset_Z0, offset_ZE,
- queue);
+ return surfaceToData(reader->GetOutput(),
+ dx,
+ offset_X0, offset_XE,
+ offset_Y0, offset_YE,
+ offset_Z0, offset_ZE,
+ queue);
}
- SPDataWithGhostNodesACLData readSurfSTL(const string & fileName,
- double dx,
- acl::CommandQueue queue)
+ SPDataWithGhostNodesACLData readSurfaceSTL(const string & fileName,
+ double dx,
+ acl::CommandQueue queue)
{
vtkSmartPointer<vtkSTLReader> reader(vtkSmartPointer<vtkSTLReader>::New());
reader->SetFileName(fileName.c_str());
reader->Update();
- return surfToData(reader->GetOutput(),dx,queue);
+ return surfaceToData(reader->GetOutput(),dx,queue);
}
- SPDataWithGhostNodesACLData readSurfSTL(const string & fileName,
- Block & b,
- acl::CommandQueue queue)
+ SPDataWithGhostNodesACLData readSurfaceSTL(const string & fileName,
+ Block & b,
+ acl::CommandQueue queue)
{
vtkSmartPointer<vtkSTLReader> reader(vtkSmartPointer<vtkSTLReader>::New());
reader->SetFileName(fileName.c_str());
reader->Update();
- return surfToData(reader->GetOutput(),b,queue);
+ return surfaceToData(reader->GetOutput(),b,queue);
}
- SPDataWithGhostNodesACLData readSurfSTL(const string & fileName,
- double dx,
- double offset_X0, double offset_XE,
- double offset_Y0, double offset_YE,
- double offset_Z0, double offset_ZE,
- acl::CommandQueue queue)
+ SPDataWithGhostNodesACLData readSurfaceSTL(const string & fileName,
+ double dx,
+ double offset_X0, double offset_XE,
+ double offset_Y0, double offset_YE,
+ double offset_Z0, double offset_ZE,
+ acl::CommandQueue queue)
{
vtkSmartPointer<vtkSTLReader> reader(vtkSmartPointer<vtkSTLReader>::New());
reader->SetFileName(fileName.c_str());
reader->Update();
- return surfToData(reader->GetOutput(),
- dx,
- offset_X0, offset_XE,
- offset_Y0, offset_YE,
- offset_Z0, offset_ZE,
- queue);
+ return surfaceToData(reader->GetOutput(),
+ dx,
+ offset_X0, offset_XE,
+ offset_Y0, offset_YE,
+ offset_Z0, offset_ZE,
+ queue);
}
- SPDataWithGhostNodesACLData readSurf(const string & fileName,
- double dx,
- acl::CommandQueue queue)
+ SPDataWithGhostNodesACLData readSurface(const string & fileName,
+ double dx,
+ acl::CommandQueue queue)
{
string fileExtension;
path pathToFile(fileName);
@@ -315,10 +315,10 @@ namespace asl
SPDataWithGhostNodesACLData data;
if (fileExtension == ".vtp")
- data = readSurfVTKXML(fileName, dx, queue);
+ data = readSurfaceVTKXML(fileName, dx, queue);
if (fileExtension == ".stl")
- data = readSurfSTL(fileName, dx, queue);
+ data = readSurfaceSTL(fileName, dx, queue);
if (data.get() == 0)
errorMessage("Reader: file format not supported");
@@ -326,9 +326,9 @@ namespace asl
return data;
}
- SPDataWithGhostNodesACLData readSurf(const string & fileName,
- Block & b,
- acl::CommandQueue queue)
+ SPDataWithGhostNodesACLData readSurface(const string & fileName,
+ Block & b,
+ acl::CommandQueue queue)
{
string fileExtension;
path pathToFile(fileName);
@@ -337,10 +337,10 @@ namespace asl
SPDataWithGhostNodesACLData data;
if (fileExtension == ".vtp")
- data = readSurfVTKXML(fileName, b, queue);
+ data = readSurfaceVTKXML(fileName, b, queue);
if (fileExtension == ".stl")
- data = readSurfSTL(fileName, b, queue);
+ data = readSurfaceSTL(fileName, b, queue);
if (data.get() == 0)
errorMessage("Reader: file format not supported");
@@ -348,12 +348,12 @@ namespace asl
return data;
}
- SPDataWithGhostNodesACLData readSurf(const string & fileName,
- double dx,
- double offset_X0, double offset_XE,
- double offset_Y0, double offset_YE,
- double offset_Z0, double offset_ZE,
- acl::CommandQueue queue)
+ SPDataWithGhostNodesACLData readSurface(const string & fileName,
+ double dx,
+ double offset_X0, double offset_XE,
+ double offset_Y0, double offset_YE,
+ double offset_Z0, double offset_ZE,
+ acl::CommandQueue queue)
{
string fileExtension;
path pathToFile(fileName);
@@ -362,20 +362,20 @@ namespace asl
SPDataWithGhostNodesACLData data;
if (fileExtension == ".vtp")
- data = readSurfVTKXML(fileName,
- dx,
- offset_X0, offset_XE,
- offset_Y0, offset_YE,
- offset_Z0, offset_ZE,
- queue);
+ data = readSurfaceVTKXML(fileName,
+ dx,
+ offset_X0, offset_XE,
+ offset_Y0, offset_YE,
+ offset_Z0, offset_ZE,
+ queue);
if (fileExtension == ".stl")
- data = readSurfSTL(fileName,
- dx,
- offset_X0, offset_XE,
- offset_Y0, offset_YE,
- offset_Z0, offset_ZE,
- queue);
+ data = readSurfaceSTL(fileName,
+ dx,
+ offset_X0, offset_XE,
+ offset_Y0, offset_YE,
+ offset_Z0, offset_ZE,
+ queue);
if (data.get() == 0)
errorMessage("Reader: file format not supported");
diff --git a/src/readers/aslVTKFormatReaders.h b/src/readers/aslVTKFormatReaders.h
index 7da16e1..ea599be 100644
--- a/src/readers/aslVTKFormatReaders.h
+++ b/src/readers/aslVTKFormatReaders.h
@@ -63,21 +63,21 @@ namespace asl
/// returns asl data;
/// Supported formats: .vtp .stl
/// \ingroup IO
- SPDataWithGhostNodesACLData readSurf(const string & fileName,
- double dx,
- acl::CommandQueue queue = acl::hardware.defaultQueue);
+ SPDataWithGhostNodesACLData readSurface(const string & fileName,
+ double dx,
+ acl::CommandQueue queue = acl::hardware.defaultQueue);
- SPDataWithGhostNodesACLData readSurf(const string & fileName,
- Block & b,
- acl::CommandQueue queue = acl::hardware.defaultQueue);
+ SPDataWithGhostNodesACLData readSurface(const string & fileName,
+ Block & b,
+ acl::CommandQueue queue = acl::hardware.defaultQueue);
// read surface with offsets retative to the surface outframe
- SPDataWithGhostNodesACLData readSurf(const string & fileName,
- double dx,
- double offset_X0, double offset_XE,
- double offset_Y0, double offset_YE,
- double offset_Z0, double offset_ZE,
- acl::CommandQueue queue = acl::hardware.defaultQueue);
+ SPDataWithGhostNodesACLData readSurface(const string & fileName,
+ double dx,
+ double offset_X0, double offset_XE,
+ double offset_Y0, double offset_YE,
+ double offset_Z0, double offset_ZE,
+ acl::CommandQueue queue = acl::hardware.defaultQueue);
} // asl
diff --git a/test/testAGL/testVTK_IO.cc b/test/testAGL/testVTK_IO.cc
index 2e40512..b4ccc6d 100644
--- a/test/testAGL/testVTK_IO.cc
+++ b/test/testAGL/testVTK_IO.cc
@@ -57,14 +57,14 @@ void testMINCplus()
}
-void testSurfSTL()
+void testSurfaceSTL()
{
cout << "Test of Surface STL files reader..." << endl;
- auto data(asl::readSurf("bus.stl", 5));
-// auto data(asl::readSurf("xx.vtp", .01));
+ auto data(asl::readSurface("bus.stl", 5));
+// auto data(asl::readSurface("xx.vtp", .01));
- asl::writeVTKXML("dataSurfSTL.vti",
+ asl::writeVTKXML("dataSurfaceSTL.vti",
*data,
"data");
}
@@ -75,6 +75,6 @@ int main()
{
// testMINC();
// testMINCplus();
- testSurfSTL();
+ testSurfaceSTL();
return 0;
}
diff --git a/test/testPhysics/flow/bus_wind.cc b/test/testPhysics/flow/bus_wind.cc
index 0b0e0f1..c3946ef 100644
--- a/test/testPhysics/flow/bus_wind.cc
+++ b/test/testPhysics/flow/bus_wind.cc
@@ -60,7 +60,7 @@ int main()
std::cout<<"Flow: Data initialization...";
- auto object(asl::readSurf("bus.stl", dx.v(), 1.5,.25,0.,1.,3.,1.));
+ auto object(asl::readSurface("bus.stl", dx.v(), 1.5,.25,0.,1.,3.,1.));
asl::Block block(object->getInternalBlock());
diff --git a/test/testPhysics/flow/compressor.cc b/test/testPhysics/flow/compressor.cc
index fb21bfc..e724aa3 100644
--- a/test/testPhysics/flow/compressor.cc
+++ b/test/testPhysics/flow/compressor.cc
@@ -80,7 +80,7 @@ int main()
std::cout<<"Compressor: Data initialization...";
- auto compressorMap(asl::readSurf("axial-compressor.stl", bl));
+ auto compressorMap(asl::readSurface("axial-compressor.stl", bl));
asl::Block block(compressorMap->getInternalBlock());
@@ -88,7 +88,7 @@ int main()
asl::initData(comprCaseMap, generateCase(block));
- std::cout<<"Finished"<<endl;
+ std::cout << "Finished" << endl;
std::cout<<"Compressor: Numerics initialization...";
diff --git a/test/testPhysics/flow/flowAroundObject.cc b/test/testPhysics/flow/flowAroundObject.cc
index 23db45f..30768a3 100644
--- a/test/testPhysics/flow/flowAroundObject.cc
+++ b/test/testPhysics/flow/flowAroundObject.cc
@@ -85,7 +85,7 @@ int main()
std::cout<<"Flow: Data initialization...";
- auto object(asl::readSurf("train1.stl", bl));
+ auto object(asl::readSurface("train1.stl", bl));
asl::Block block(object->getInternalBlock());
@@ -99,9 +99,9 @@ int main()
std::cout<<"Flow: Numerics initialization...";
- asl::SPLBGK lbgk(new asl::LBGK(block,
- acl::generateVEConstant(FlT(nuNum.v())),
- &asl::d3q15()));
+ asl::SPLBGK lbgk(new asl::LBGK(block,
+ acl::generateVEConstant(FlT(nuNum.v())),
+ &asl::d3q15()));
lbgk->init();
asl::SPLBGKUtilities lbgkUtil(new asl::LBGKUtilities(lbgk));
diff --git a/test/testPhysics/flow/locomotive_in_tunnel.cc b/test/testPhysics/flow/locomotive_in_tunnel.cc
index 9fe5c9c..062ba21 100644
--- a/test/testPhysics/flow/locomotive_in_tunnel.cc
+++ b/test/testPhysics/flow/locomotive_in_tunnel.cc
@@ -82,10 +82,10 @@ int main()
Param nuNum(nu.v()*dt.v()/dx.v()/dx.v());
- std::cout<<"Flow: Data initialization...";
+ std::cout << "Flow: Data initialization...";
- auto object(asl::readSurf("locomotive.stl", bl));
+ auto object(asl::readSurface("locomotive.stl", bl));
asl::Block block(object->getInternalBlock());
@@ -95,9 +95,9 @@ int main()
auto forceField(asl::generateDataContainerACL_SP<FlT>(block, 3, 1u));
asl::initData(forceField, makeAVec(0.,0.,0.));
- std::cout<<"Finished"<<endl;
+ std::cout << "Finished" << endl;
- std::cout<<"Flow: Numerics initialization...";
+ std::cout << "Flow: Numerics initialization...";
asl::SPLBGK lbgk(new asl::LBGKTurbulence(block,
acl::generateVEConstant(FlT(nu.v())),
diff --git a/test/testPhysics/flow/locomotive_stability.cc b/test/testPhysics/flow/locomotive_stability.cc
index 6e8e2e0..0d52dae 100644
--- a/test/testPhysics/flow/locomotive_stability.cc
+++ b/test/testPhysics/flow/locomotive_stability.cc
@@ -83,7 +83,7 @@ int main()
std::cout<<"Flow: Data initialization...";
- auto object(asl::readSurf("locomotive.stl", dx.v(), .5,1.,0.,1.,2.,4.));
+ auto object(asl::readSurface("locomotive.stl", dx.v(), .5,1.,0.,1.,2.,4.));
asl::Block block(object->getInternalBlock());
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/asl.git
More information about the debian-science-commits
mailing list