ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-24 04:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into parallel_meshing

Browse Source
This commit is contained in:
Matthias Hochsteger 2021-06-25 17:32:16 +02:00
commit 34629749d6
7 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libsrc/core/archive.hpp
View File

@ -153,6 +153,7 @@ namespace ngcore
virtual void NeedsVersion(const std::string& /*unused*/, const std::string& /*unused*/) {}
// Pure virtual functions that have to be implemented by In-/OutArchive
virtual Archive & operator & (std::byte & d) = 0;
virtual Archive & operator & (float & d) = 0;
virtual Archive & operator & (double & d) = 0;
virtual Archive & operator & (int & i) = 0;
@ -275,6 +276,9 @@ namespace ngcore
Archive & Do (T * data, size_t n)
{ for (size_t j = 0; j < n; j++) { (*this) & data[j]; }; return *this; }; // NOLINT
virtual Archive & Do (std::byte * d, size_t n)
{ for (size_t j = 0; j < n; j++) { (*this) & d[j]; }; return *this; }; // NOLINT
virtual Archive & Do (double * d, size_t n)
{ for (size_t j = 0; j < n; j++) { (*this) & d[j]; }; return *this; }; // NOLINT
@ -679,6 +683,8 @@ namespace ngcore
BinaryOutArchive& operator=(BinaryOutArchive&&) = delete;
using Archive::operator&;
Archive & operator & (std::byte & d) override
{ return Write(d); }
Archive & operator & (float & f) override
{ return Write(f); }
Archive & operator & (double & d) override
@ -755,6 +761,8 @@ namespace ngcore
: BinaryInArchive(std::make_shared<std::ifstream>(filename)) { ; }
using Archive::operator&;
Archive & operator & (std::byte & d) override
{ Read(d); return *this; }
Archive & operator & (float & f) override
{ Read(f); return *this; }
Archive & operator & (double & d) override
@ -826,6 +834,8 @@ namespace ngcore
TextOutArchive(std::make_shared<std::ofstream>(filename)) { }
using Archive::operator&;
Archive & operator & (std::byte & d) override
{ *stream << std::hex << int(d) << ' '; return *this; }
Archive & operator & (float & f) override
{ *stream << f << '\n'; return *this; }
Archive & operator & (double & d) override
@ -879,6 +889,8 @@ namespace ngcore
: TextInArchive(std::make_shared<std::ifstream>(filename)) {}
using Archive::operator&;
Archive & operator & (std::byte & d) override
{ int tmp; *stream >> std::hex >> tmp; d = std::byte(tmp); return *this; }
Archive & operator & (float & f) override
{ *stream >> f; return *this; }
Archive & operator & (double & d) override
@ -941,6 +953,7 @@ namespace ngcore
{ h = (char*)&hash_value; }
using Archive::operator&;
Archive & operator & (std::byte & d) override { return ApplyHash(d); }
Archive & operator & (float & f) override { return ApplyHash(f); }
Archive & operator & (double & d) override { return ApplyHash(d); }
Archive & operator & (int & i) override { return ApplyHash(i); }

2
libsrc/interface/nginterface.cpp
View File

@ -150,7 +150,7 @@ void Ng_LoadMesh (const char * filename, ngcore::NgMPI_Comm comm)
mesh->SetCommunicator(comm);
string fn(filename);
if (fn.substr (fn.length()-8, 8) == ".vol.bin")
if (fn.length() > 8 && fn.substr (fn.length()-8, 8) == ".vol.bin")
{
mesh -> Load(fn);
SetGlobalMesh (mesh);

4
libsrc/linalg/bfgs.cpp
View File

@ -331,7 +331,7 @@ double BFGS (
{
if (LDLtUpdate (l, d, 1 / a1, y) != 0)
{
cerr << "BFGS update error1" << endl;
// cerr << "BFGS update error1" << endl;
(*testout) << "BFGS update error1" << endl;
(*testout) << "l " << endl << l << endl
<< "d " << d << endl;
@ -341,7 +341,7 @@ double BFGS (
if (LDLtUpdate (l, d, -1 / a2, bs) != 0)
{
cerr << "BFGS update error2" << endl;
// cerr << "BFGS update error2" << endl;
(*testout) << "BFGS update error2" << endl;
(*testout) << "l " << endl << l << endl
<< "d " << d << endl;

4
libsrc/meshing/meshtype.cpp
View File

@ -1140,8 +1140,8 @@ namespace netgen
typ = ELEMENT_TYPE(_typ);
is_curved = _curved;
for (size_t i = 0; i < np; i++)
ar & pnum[i];
static_assert(sizeof(int) == sizeof (PointIndex));
ar.Do( (int*)&pnum[0], np);
}
void Element :: SetOrder (const int aorder)

4
libsrc/meshing/meshtype.hpp
View File

@ -377,7 +377,9 @@ namespace netgen
void DoArchive (Archive & ar)
{
ar & x[0] & x[1] & x[2] & layer & singular;
// ar & x[0] & x[1] & x[2] & layer & singular;
ar.Do(&x[0], 3);
ar & layer & singular;
ar & (unsigned char&)(type);
}
};

6
libsrc/meshing/topology.cpp
View File

@ -49,6 +49,7 @@ namespace netgen
{
buildedges = static_buildedges;
buildfaces = static_buildfaces;
buildvertex2element = static_buildvertex2element;
timestamp = -1;
}
@ -75,6 +76,7 @@ namespace netgen
bool MeshTopology :: static_buildedges = true;
bool MeshTopology :: static_buildfaces = true;
bool MeshTopology :: static_buildvertex2element = true;
void MeshTopology :: EnableTableStatic (string name, bool set)
{
@ -82,9 +84,11 @@ namespace netgen
static_buildedges = set;
else if (name == "faces")
static_buildfaces = set;
else if (name == "vertex2element")
static_buildvertex2element = set;
else
throw Exception ("noting known about table "+name +"\n"
"knwon are 'edges', 'faces'");
"knwon are 'edges', 'faces', 'vertex2element'");
}

4
libsrc/meshing/topology.hpp
View File

@ -43,12 +43,12 @@ struct T_FACE
class MeshTopology
{
const Mesh * mesh;
bool buildvertex2element = true;
bool buildvertex2element;
bool buildedges;
bool buildfaces;
bool build_parent_edges = false; // may be changed to default = false
bool build_parent_faces = false; // may be changed to default = false
static bool static_buildedges, static_buildfaces;
static bool static_buildedges, static_buildfaces, static_buildvertex2element;
NgArray<INDEX_2> edge2vert;
NgArray<INDEX_4> face2vert;