#BOS 37851: cast tuple types for compilation on FD38

[plugins/netgenplugin.git] / src / NETGENPlugin / NETGENPlugin_DriverParam.cxx

diff --git a/src/NETGENPlugin/NETGENPlugin_DriverParam.cxx b/src/NETGENPlugin/NETGENPlugin_DriverParam.cxx
index 2ddf398a43e627c0e38b0a29db13c35a90b49f77..fedea933a748d4200e28720ab9a249c0a8383216 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_DriverParam.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_DriverParam.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2023  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -26,22 +26,18 @@
 //
 #include "NETGENPlugin_DriverParam.hxx"
 
+
 #include <iostream>
 #include <fstream>
 #include <string>
 #include <cassert>
 
-
-// TODO: Error handling of read/write
-
 /**
  * @brief Print content of a netgen_params
  *
  * @param aParams The object to display
  */
 void printNetgenParams(netgen_params& aParams){
-  // TODO: prettier print
-  // TODO: Add call to print in log
   std::cout << "has_netgen_param: " << aParams.has_netgen_param << std::endl;
   std::cout << "maxh: " << aParams.maxh << std::endl;
   std::cout << "minh: " << aParams.minh << std::endl;
@@ -63,6 +59,7 @@ void printNetgenParams(netgen_params& aParams){
   std::cout << "checkoverlap: " << aParams.checkoverlap << std::endl;
   std::cout << "checkchartboundary: " << aParams.checkchartboundary << std::endl;
   std::cout << "closeedgefac: " << aParams.closeedgefac << std::endl;
+  std::cout << "nbThreadMesher: " << aParams.nbThreads << std::endl;
   std::cout << "has_local_size: " << aParams.has_local_size << std::endl;
   std::cout << "meshsizefilename: " << aParams.meshsizefilename << std::endl;
   std::cout << "has_maxelementvolume_hyp: " << aParams.has_maxelementvolume_hyp << std::endl;
@@ -123,6 +120,8 @@ void importNetgenParams(const std::string param_file, netgen_params& aParams){
   std::getline(myfile, line);
   aParams.closeedgefac = std::stoi(line);
   std::getline(myfile, line);
+  aParams.nbThreads = std::stoi(line);
+  std::getline(myfile, line);
   aParams.has_local_size = std::stoi(line);
   std::getline(myfile, line);
   aParams.meshsizefilename = line;
@@ -133,7 +132,6 @@ void importNetgenParams(const std::string param_file, netgen_params& aParams){
   std::getline(myfile, line);
   aParams.maxElementVolume = std::stoi(line);
 
-  myfile.close();
 };
 
 /**
@@ -165,50 +163,10 @@ void exportNetgenParams(const std::string param_file, netgen_params& aParams){
   myfile << aParams.checkoverlap << std::endl;
   myfile << aParams.checkchartboundary << std::endl;
   myfile << aParams.closeedgefac << std::endl;
+  myfile << aParams.nbThreads << std::endl;
   myfile << aParams.has_local_size << std::endl;
   myfile << aParams.meshsizefilename << std::endl;
   myfile << aParams.has_maxelementvolume_hyp << std::endl;
   myfile << aParams.maxElementVolume << std::endl;
   myfile << aParams.has_LengthFromEdges_hyp << std::endl;
-
-  myfile.close();
 };
-
-/**
- * @brief Compares two netgen_parms object
- *
- * @param params1 Object 1
- * @param params2 Object 2
-
- * @return true if the two object are identical
- */
-bool diffNetgenParams(netgen_params params1, netgen_params params2){
-  bool ret = true;
-  ret &= params1.maxh == params2.maxh;
-  ret &= params1.minh == params2.minh;
-  ret &= params1.segmentsperedge == params2.segmentsperedge;
-  ret &= params1.grading == params2.grading;
-  ret &= params1.curvaturesafety == params2.curvaturesafety;
-  ret &= params1.secondorder == params2.secondorder;
-  ret &= params1.quad == params2.quad;
-  ret &= params1.optimize == params2.optimize;
-  ret &= params1.fineness == params2.fineness;
-  ret &= params1.uselocalh == params2.uselocalh;
-  ret &= params1.merge_solids == params2.merge_solids;
-  ret &= params1.chordalError == params2.chordalError;
-  ret &= params1.optsteps2d == params2.optsteps2d;
-  ret &= params1.optsteps3d == params2.optsteps3d;
-  ret &= params1.elsizeweight == params2.elsizeweight;
-  ret &= params1.opterrpow == params2.opterrpow;
-  ret &= params1.delaunay == params2.delaunay;
-  ret &= params1.checkoverlap == params2.checkoverlap;
-  ret &= params1.checkchartboundary == params2.checkchartboundary;
-  ret &= params1.closeedgefac == params2.closeedgefac;
-  ret &= params1.has_local_size == params2.has_local_size;
-  ret &= params1.meshsizefilename == params2.meshsizefilename;
-  ret &= params1.has_maxelementvolume_hyp == params2.has_maxelementvolume_hyp;
-  ret &= params1.maxElementVolume == params2.maxElementVolume;
-  ret &= params1.has_LengthFromEdges_hyp == params2.has_LengthFromEdges_hyp;
-
-  return ret;
-}