big update to make it compile

Author: githubgrasp

src/converter/CMakeLists.txt

@@ -12,8 +12,6 @@ line.C
 lognormalGenerator.C
 main.C
 octreegridlocalizer.C
-outputmanager.C
-overlap.C
 prism.C
 region.C
 surface.C
@@ -22,6 +20,7 @@ vertex.C
 converterinputrecord.C
 convertertxtinputrecord.C
 convertertxtdatareader.C
+boundarysphere.C
 )
 
 add_library(converter STATIC ${CONVERTER_SOURCES})

src/converter/boundarysphere.C

@@ -39,10 +39,10 @@ void BoundarySphere :: findOutsiders(oofem::FloatArray &boundaries)
     //For nodes: 0 = inside,  1 = outside, 2 = on boundary
     //For elements: 0 = inside, 1 = completetly outside (one node could be on boundary), 2 = one node inside and one outside, 3 = on boundary
 
-    IntArray nodes;
+    oofem::IntArray nodes;
     oofem::FloatArray coords, coordsOne, coordsTwo;
     int outsideFlag;
-    IntArray locationArray(2);
+    oofem::IntArray locationArray(2);
 
     double newTol = 1.e3*this->grid->giveTol();
 
@@ -143,10 +143,10 @@ void BoundarySphere :: findOutsiders(oofem::FloatArray &boundaries)
 int
 BoundarySphere :: modifyVoronoiCrossSection(int elementNumber)
 {
-    IntArray crossSectionElements;
-    IntArray crossSectionVertices;
+    oofem::IntArray crossSectionElements;
+    oofem::IntArray crossSectionVertices;
 
-    IntArray nodes(2);
+    oofem::IntArray nodes(2);
 
     oofem::FloatArray coords(3);
 
@@ -183,7 +183,7 @@ BoundarySphere :: modifyVoronoiCrossSection(int elementNumber)
 
     //Resize cross-section elements
     int newSize = elementSize - elementCounter;
-    IntArray modifiedCrossSectionElements(newSize);
+    oofem::IntArray modifiedCrossSectionElements(newSize);
     int help = 0;
     for ( int i = 0; i < elementSize; i++ ) {
         if ( crossSectionElements.at(i + 1) == 0 ) {
@@ -204,7 +204,7 @@ BoundarySphere :: modifyVoronoiCrossSection(int elementNumber)
     }
 
     //Write modified vertex vector
-    IntArray modifiedCrossSectionVertices(vertexSize - nodeCounter);
+    oofem::IntArray modifiedCrossSectionVertices(vertexSize - nodeCounter);
     help = 0;
     for ( int i = 0; i < vertexSize; i++ ) {
         if ( crossSectionVertices.at(i + 1) == 0 ) {

src/converter/converterdatareader.h

@@ -57,7 +57,7 @@ class ConverterDataReader
 public:
     /// Determines the type of input record.
     enum ConverterInputRecordType {
-        CIR_domainRec, CIR_controlRec, CIR_domainCompRec, CIR_vertexRec, CIR_controlVertexRec, CIR_curveRec, CIR_surfaceRec, CIR_regionRec, CIR_inclusionRec, CIR_aggregateRec, CIR_refinementRec
+        CIR_domainRec, CIR_controlRec, CIR_domainCompRec, CIR_vertexRec, CIR_controlVertexRec, CIR_curveRec, CIR_surfaceRec, CIR_regionRec, CIR_inclusionRec, CIR_fibreRec
     };
 
     ConverterDataReader() { }

src/converter/convertererror.h

@@ -5,7 +5,9 @@
 #include <string>
 
 namespace converter {
-// Simple message (no formatting)
+
+
+  // Simple message (no formatting)
 [[noreturn]] inline void error(const std::string &msg) {
     std::fputs(msg.c_str(), stderr);
     std::fputc('\n', stderr);
@@ -26,4 +28,12 @@ namespace converter {
 [[noreturn]] inline void error4(const char *fmt, int a, int b, int c) {
     errorf(fmt, a, b, c);
 }
+
+inline FILE* fopen_or_die(const std::string& name, const char* mode) {
+    if (FILE* f = std::fopen(name.c_str(), mode)) return f;
+    errorf("Cannot open output file %s", name.c_str());
+    return nullptr; // unreachable
+}
+
+  
 } // namespace converter

src/converter/converterinputrecord.C

@@ -35,7 +35,7 @@
 #include <string>
 #include <algorithm>
 #include <cctype>
-#include "generatorinputrecord.h"
+#include "converterinputrecord.h"
 
 void
 ConverterInputRecord::giveOptionalField(int &answer, InputFieldType id)

src/converter/converterlistutils.h

@@ -2,9 +2,13 @@
 #include <vector>
 #include <iostream>
 #include <cstdlib>
+#include "convertererror.h"
 
 namespace converter {
-template< class T >
+
+
+
+  template< class T >
 inline bool includes1(const std::vector< T * > &v, int i) {
     return i >= 1 && static_cast< size_t >( i ) <= v.size() && v [ i - 1 ] != nullptr;
 }
@@ -50,4 +54,13 @@ template< class T >
 inline int size1(const std::vector< T * > &v) {
     return static_cast< int >( v.size() );
 }
+
+template <class T>
+inline T* require_at1(std::vector<T*>& v, int i, const char* what) {
+    if (includes1(v, i)) return at1(v, i);
+    errorf("%s: undefined id (%d)", what, i);
+    return nullptr;
+}
+
+
 } // namespace converter

src/converter/convertertxtdatareader.C

@@ -32,8 +32,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "generatorerror.h"
-#include "generatortxtdatareader.h"
+#include "convertererror.h"
+#include "convertertxtdatareader.h"
 #include "error.h"
 #include <iostream>
 #include <string>
@@ -46,7 +46,7 @@ ConverterTXTDataReader::ConverterTXTDataReader(std::string inputfilename) : Conv
     {
         std::ifstream inputStream(dataSourceName);
         if ( !inputStream.is_open() ) {
-            generator::errorf("Can't open input stream (%s)", dataSourceName.c_str() );
+            converter::errorf("Can't open input stream (%s)", dataSourceName.c_str() );
         }
 
         int lineNumber = 0;
@@ -72,7 +72,7 @@ ConverterTXTDataReader::ConverterTXTDataReader(std::string inputfilename) : Conv
             std::string line;
             std::ifstream includedStream(fname);
             if ( !includedStream.is_open() ) {
-                generator::errorf("Can't open input stream (%s)", fname.c_str() );
+                converter::errorf("Can't open input stream (%s)", fname.c_str() );
             }
             while ( this->giveLineFromInput(includedStream, includedLine, line) ) {
                 lines.emplace(it, make_pair(includedLine, line) );
@@ -97,7 +97,7 @@ ConverterInputRecord &
 ConverterTXTDataReader::giveInputRecord(ConverterInputRecordType typeId, int recordId)
 {
     if ( this->it == this->recordList.end() ) {
-        generator::error("Out of input records, file contents must be missing");
+        converter::error("Out of input records, file contents must be missing");
     }
     return * this->it++;
 }

src/converter/convertertxtinputrecord.C

@@ -32,14 +32,14 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "generatortxtinputrecord.h"
+#include "convertertxtinputrecord.h"
 #include "intarray.h"
 #include "floatarray.h"
 #include "floatmatrix.h"
 #include "dictionary.h"
 #include "range.h"
 #include "scalarfunction.h"
-#include "generatorerror.h"
+#include "convertererror.h"
 
 
 #include <cstdlib>

src/converter/ellipsoid.h

@@ -69,7 +69,8 @@ class Ellipsoid : public Inclusion
     /// Returns class name of the receiver.
     const char *giveClassName() const { return "Ellipsoid"; }
 
-    void initializeFrom(ConverterInputRecord &ir);
+
+    void initializeFrom(ConverterInputRecord &ir) override;
 
   // to know whether a point is inside the ellipsoid
   // 1 means inside , 0 outisde , 2 in the ITZ (if specified)