mirror of
https://github.com/NGSolve/netgen.git
synced 2024-12-25 05:20:34 +05:00
MSVC adaption
This commit is contained in:
parent
6222d32e34
commit
ff3eaf1119
@ -9,7 +9,7 @@
|
|||||||
extern int id;
|
extern int id;
|
||||||
extern int ntasks;
|
extern int ntasks;
|
||||||
#endif
|
#endif
|
||||||
extern int printmessage_importance;
|
DLL_HEADER extern int printmessage_importance;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
// #include <iostream>
|
// #include <iostream>
|
||||||
/** output stream for testing.
|
/** output stream for testing.
|
||||||
testout is opened by main */
|
testout is opened by main */
|
||||||
extern ostream * testout;
|
DLL_HEADER extern ostream * testout;
|
||||||
|
|
||||||
/** use instead of cout */
|
/** use instead of cout */
|
||||||
extern ostream * mycout;
|
extern ostream * mycout;
|
||||||
|
@ -24,6 +24,15 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef WIN32
|
||||||
|
#define DLL_HEADER __declspec(dllexport)
|
||||||
|
#else
|
||||||
|
#define DLL_HEADER
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#define noDEMOVERSION
|
#define noDEMOVERSION
|
||||||
#define noDEVELOP
|
#define noDEVELOP
|
||||||
#define noSTEP
|
#define noSTEP
|
||||||
|
@ -1136,6 +1136,8 @@ HPREF_ELEMENT_TYPE ClassifyQuad(HPRefElement & el, INDEX_2_HASHTABLE<int> & edge
|
|||||||
int ep1(-1), ep2(-1), ep3(-1), ep4(-1), cp1(-1), cp2(-1), cp3(-1), cp4(-1);
|
int ep1(-1), ep2(-1), ep3(-1), ep4(-1), cp1(-1), cp2(-1), cp3(-1), cp4(-1);
|
||||||
int isedge1, isedge2, isedge3, isedge4;
|
int isedge1, isedge2, isedge3, isedge4;
|
||||||
|
|
||||||
|
*testout << "edges = " << edges << endl;
|
||||||
|
|
||||||
for (int j = 1; j <= 4; j++)
|
for (int j = 1; j <= 4; j++)
|
||||||
{
|
{
|
||||||
ep1 = edgepoint.Test (el.PNumMod (j));
|
ep1 = edgepoint.Test (el.PNumMod (j));
|
||||||
@ -1291,6 +1293,10 @@ HPREF_ELEMENT_TYPE ClassifyQuad(HPRefElement & el, INDEX_2_HASHTABLE<int> & edge
|
|||||||
int sumep = ep1 + ep2 + ep3 + ep4;
|
int sumep = ep1 + ep2 + ep3 + ep4;
|
||||||
int sumedge = isedge1 + isedge2 + isedge3 + isedge4;
|
int sumedge = isedge1 + isedge2 + isedge3 + isedge4;
|
||||||
|
|
||||||
|
*testout << "isedge = " << isedge1 << isedge2 << isedge3 << isedge4 << endl;
|
||||||
|
*testout << "iscp = " << cp1 << cp2 << cp3 << cp4 << endl;
|
||||||
|
*testout << "isep = " << ep1 << ep2 << ep3 << ep4 << endl;
|
||||||
|
|
||||||
switch (sumedge)
|
switch (sumedge)
|
||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
@ -1465,8 +1471,9 @@ HPREF_ELEMENT_TYPE ClassifyQuad(HPRefElement & el, INDEX_2_HASHTABLE<int> & edge
|
|||||||
<< isedge4 << endl;
|
<< isedge4 << endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
*testout << "quad type = " << type << endl;
|
||||||
|
|
||||||
return(type);
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
namespace netgen
|
namespace netgen
|
||||||
{
|
{
|
||||||
|
|
||||||
int printmessage_importance = 5;
|
int printmessage_importance = 5;
|
||||||
int printwarnings = 1;
|
int printwarnings = 1;
|
||||||
int printerrors = 1;
|
int printerrors = 1;
|
||||||
|
Loading…
Reference in New Issue
Block a user