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

MSVC adaption

Browse Source
This commit is contained in:
Joachim Schoeberl 2009-04-17 04:07:42 +00:00
parent 6222d32e34
commit ff3eaf1119
5 changed files with 480 additions and 465 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/general/netgenout.hpp
View File

@ -9,7 +9,7 @@
extern int id;
extern int ntasks;
#endif
extern int printmessage_importance;
DLL_HEADER extern int printmessage_importance;

2
libsrc/general/template.hpp
View File

@ -20,7 +20,7 @@
// #include <iostream>
/** output stream for testing.
testout is opened by main */
extern ostream * testout;
DLL_HEADER extern ostream * testout;
/** use instead of cout */
extern ostream * mycout;

9
libsrc/include/mydefs.hpp
View File

@ -24,6 +24,15 @@
#endif
#ifdef WIN32
#define DLL_HEADER __declspec(dllexport)
#else
#define DLL_HEADER
#endif
#define noDEMOVERSION
#define noDEVELOP
#define noSTEP

13
libsrc/meshing/classifyhpel.hpp
View File

@ -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 isedge1, isedge2, isedge3, isedge4;
*testout << "edges = " << edges << endl;
for (int j = 1; j <= 4; j++)
{
ep1 = edgepoint.Test (el.PNumMod (j));
@ -1218,7 +1220,7 @@ HPREF_ELEMENT_TYPE ClassifyQuad(HPRefElement & el, INDEX_2_HASHTABLE<int> & edge
}
//MH***********************************************************************************************************
//MH***********************************************************************************************************
if(ep1)
if(edgepoint.Test(p[0]))
{
@ -1251,7 +1253,7 @@ HPREF_ELEMENT_TYPE ClassifyQuad(HPRefElement & el, INDEX_2_HASHTABLE<int> & edge
if(!edges.Used(i2a) && !edges.Used(i2b))
cp4 = 1;
}
//MH*****************************************************************************************************************************
//MH*****************************************************************************************************************************
}
else
{
@ -1291,6 +1293,10 @@ HPREF_ELEMENT_TYPE ClassifyQuad(HPRefElement & el, INDEX_2_HASHTABLE<int> & edge
int sumep = ep1 + ep2 + ep3 + ep4;
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)
{
case 0:
@ -1465,8 +1471,9 @@ HPREF_ELEMENT_TYPE ClassifyQuad(HPRefElement & el, INDEX_2_HASHTABLE<int> & edge
<< isedge4 << endl;
}
*testout << "quad type = " << type << endl;
return(type);
return type;
}

1
libsrc/meshing/msghandler.cpp
View File

@ -3,7 +3,6 @@
namespace netgen
{
int printmessage_importance = 5;
int printwarnings = 1;
int printerrors = 1;