ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-11 16:19:16 +05:00
Code Issues Packages Projects Releases Wiki Activity

Renamming function and files

Browse Source
This commit is contained in:
Yoann Audouin 2022-09-13 16:45:33 +02:00
parent 49ba6be0c2
commit 5cd6dc5421
6 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/SMESH/CMakeLists.txt
View File

@ -90,8 +90,8 @@ SET(SMESHimpl_HEADERS
SMESH_SMESH.hxx
MG_ADAPT.hxx
SMESH_Homard.hxx
DriverMesh.hxx
DriverStep.hxx
SMESH_DriverMesh.hxx
SMESH_DriverStep.hxx
)
# --- sources ---
@ -112,8 +112,8 @@ SET(SMESHimpl_SOURCES
SMESH_MesherHelper.cxx
MG_ADAPT.cxx
SMESH_Homard.cxx
DriverMesh.cxx
DriverStep.cxx
SMESH_DriverMesh.cxx
SMESH_DriverStep.cxx
)
# --- rules ---

10
src/SMESH/DriverMesh.cxx → src/SMESH/SMESH_DriverMesh.cxx
View File

@ -20,12 +20,12 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// File : DriverMesh.cxx
// File : SMESH_DriverMesh.cxx
// Author : Yoann AUDOUIN, EDF
// Module : SMESH
//
#include "DriverMesh.hxx"
#include "SMESH_DriverMesh.hxx"
#include "SMESH_Mesh.hxx"
#include "SMESH_Gen.hxx"
@ -44,7 +44,7 @@ using namespace MEDCoupling;
*
* @return true if the mesh within the files are identical
*/
bool diff_med_file(const std::string mesh_file1, const std::string mesh_file2, const std::string mesh_name){
bool diffMEDFile(const std::string mesh_file1, const std::string mesh_file2, const std::string mesh_name){
MEDFileUMesh* medmesh1 = MEDFileUMesh::New(mesh_file1, mesh_name);
MEDFileUMesh* medmesh2 = MEDFileUMesh::New(mesh_file2, mesh_name);
MEDCouplingUMesh *m0_1=medmesh1->getMeshAtLevel(0,false);
@ -61,7 +61,7 @@ bool diff_med_file(const std::string mesh_file1, const std::string mesh_file2, c
*
* @return error code
*/
int import_mesh(const std::string mesh_file, SMESH_Mesh& aMesh, const std::string mesh_name){
int importMesh(const std::string mesh_file, SMESH_Mesh& aMesh, const std::string mesh_name){
// TODO: change that as it depends on the language
std::cout << "Importing mesh from " << mesh_file << std::endl;
int ret = aMesh.MEDToMesh(mesh_file.c_str(), mesh_name.c_str());
@ -77,7 +77,7 @@ int import_mesh(const std::string mesh_file, SMESH_Mesh& aMesh, const std::strin
*
* @return error code
*/
int export_mesh(const std::string mesh_file, SMESH_Mesh& aMesh, const std::string mesh_name){
int exportMesh(const std::string mesh_file, SMESH_Mesh& aMesh, const std::string mesh_name){
// TODO: See how to get the name of the mesh. Is it usefull ?
std::cout << "Exporting mesh to " << mesh_file << std::endl;

12
src/SMESH/DriverMesh.hxx → src/SMESH/SMESH_DriverMesh.hxx
View File

@ -20,26 +20,26 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// File : DriverMesh.hxx
// File : SMESH_DriverMesh.hxx
// Author : Yoann AUDOUIN, EDF
// Module : SMESH
//
#ifndef _DRIVERMESH_HXX_
#define _DRIVERMESH_HXX_
#ifndef _SMESH_DRIVERMESH_HXX_
#define _SMESH_DRIVERMESH_HXX_
#include <string>
#include <cassert>
class SMESH_Mesh;
bool diff_med_file(const std::string mesh_file1,
bool diffMEDFile(const std::string mesh_file1,
const std::string mesh_file2,
const std::string mesh_name);
int import_mesh(const std::string mesh_file,
int importMesh(const std::string mesh_file,
SMESH_Mesh& aMesh,
const std::string meshName);
int export_mesh(const std::string mesh_file,
int exportMesh(const std::string mesh_file,
SMESH_Mesh& aMesh,
const std::string meshName);

10
src/SMESH/DriverStep.cxx → src/SMESH/SMESH_DriverStep.cxx
View File

@ -20,12 +20,12 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// File : DriverStep.cxx
// File : SMESH_DriverStep.cxx
// Author : Yoann AUDOUIN, EDF
// Module : SMESH
//
#include "DriverStep.hxx"
#include "SMESH_DriverStep.hxx"
#include <STEPControl_Reader.hxx>
#include <STEPControl_Writer.hxx>
@ -43,7 +43,7 @@
*
* @return true if the files are the same
*/
bool diff_step_file(std::string file1, std::string file2){
bool diffStepFile(std::string file1, std::string file2){
std::ifstream sfile1(file1);
std::ifstream sfile2(file2);
std::string line1, line2;
@ -77,7 +77,7 @@ bool diff_step_file(std::string file1, std::string file2){
*
* @return error code
*/
int import_shape(const std::string shape_file, TopoDS_Shape& aShape){
int importShape(const std::string shape_file, TopoDS_Shape& aShape){
std::cout << "Importing shape from " << shape_file << std::endl;
STEPControl_Reader reader;
@ -105,7 +105,7 @@ int import_shape(const std::string shape_file, TopoDS_Shape& aShape){
*
* @return error code
*/
int export_shape(const std::string shape_file, const TopoDS_Shape& aShape){
int exportShape(const std::string shape_file, const TopoDS_Shape& aShape){
std::cout << "Exporting shape to " << shape_file << std::endl;

12
src/SMESH/DriverStep.hxx → src/SMESH/SMESH_DriverStep.hxx
View File

@ -20,22 +20,22 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// File : DriverStep.hxx
// File : SMESH_DriverStep.hxx
// Author : Yoann AUDOUIN, EDF
// Module : SMESH
//
#ifndef _DRIVERSTEP_HXX_
#define _DRIVERSTEP_HXX_
#ifndef _SMESH_DRIVERSTEP_HXX_
#define _SMESH_DRIVERSTEP_HXX_
#include <string>
#include <cassert>
class TopoDS_Shape;
int import_shape(const std::string shape_file, TopoDS_Shape& aShape);
int export_shape(const std::string shape_file, const TopoDS_Shape& aShape);
bool diff_step_file(std::string file1, std::string file2);
int importShape(const std::string shape_file, TopoDS_Shape& aShape);
int exportShape(const std::string shape_file, const TopoDS_Shape& aShape);
bool diffStepFile(std::string file1, std::string file2);
#endif

4
src/SMESH/SMESH_Gen.cxx
View File

@ -30,7 +30,7 @@
#include "SMESH_Gen.hxx"
#include "DriverMesh.hxx"
#include "SMESH_DriverMesh.hxx"
#include "SMDS_Mesh.hxx"
#include "SMDS_MeshElement.hxx"
#include "SMDS_MeshNode.hxx"
@ -293,7 +293,7 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh,
{
fs::path mesh_file = fs::path(aMesh.tmp_folder) / fs::path(file_name);
// TODO: change mesh name
export_mesh(mesh_file.string(), aMesh, "Maillage_1");
exportMesh(mesh_file.string(), aMesh, "Maillage_1");
}
//Resetting threaded pool info