Skip to content
Snippets Groups Projects
Commit 7cd3fc7a authored by Emilie Marchandise's avatar Emilie Marchandise
Browse files

Bloodflow OK for bifurcation and windkessel (aorta.lua and bifurcation.lua)

high order OK for 1D but still bug in exportMsh (hack emi)
p1 for 1D for bifurcation test case still strange ...
parent 6d734c03
No related branches found
No related tags found
No related merge requests found
...@@ -397,6 +397,7 @@ void CreateOutputFile(std::string fileName, int format) ...@@ -397,6 +397,7 @@ void CreateOutputFile(std::string fileName, int format)
case FORMAT_TEX: case FORMAT_TEX:
{ {
printf("couc tex format \n");
if(!FlGui::available()) break; if(!FlGui::available()) break;
FILE *fp = fopen(fileName.c_str(), "w"); FILE *fp = fopen(fileName.c_str(), "w");
...@@ -428,7 +429,7 @@ void CreateOutputFile(std::string fileName, int format) ...@@ -428,7 +429,7 @@ void CreateOutputFile(std::string fileName, int format)
#endif #endif
default: default:
Msg::Error("Unknown output file format"); Msg::Error("Unknown output file format %d", format);
printEndMessage = false; printEndMessage = false;
break; break;
} }
......
...@@ -373,7 +373,7 @@ class functionC : public function { ...@@ -373,7 +373,7 @@ class functionC : public function {
FILE *tmpMake = fopen("_tmpMake","w"); FILE *tmpMake = fopen("_tmpMake","w");
fprintf(tmpMake, "include $(DG_BUILD_DIR)/CMakeFiles/dg.dir/flags.make\n" fprintf(tmpMake, "include $(DG_BUILD_DIR)/CMakeFiles/dg.dir/flags.make\n"
"%s : %s\n" "%s : %s\n"
"\tg++ -shared -fPIC -o $@ $(CXX_FLAGS) $(CXX_DEFINES) $<\n", "\tg++ -fPIC -shared -o $@ $(CXX_FLAGS) $(CXX_DEFINES) $<\n",
filename.c_str(), "_tmpSrc.cpp"); filename.c_str(), "_tmpSrc.cpp");
fclose(tmpMake); fclose(tmpMake);
if(system("make -f _tmpMake")) if(system("make -f _tmpMake"))
...@@ -548,3 +548,9 @@ functionConstant *function::getTime() { ...@@ -548,3 +548,9 @@ functionConstant *function::getTime() {
_timeFunction = functionConstantNew(0.); _timeFunction = functionConstantNew(0.);
return _timeFunction; return _timeFunction;
} }
functionConstant *function::_dtFunction = NULL;
functionConstant *function::getDT() {
if (! _dtFunction)
_dtFunction = functionConstantNew(0.);
return _dtFunction;
}
...@@ -21,7 +21,8 @@ class functionReplaceCache; ...@@ -21,7 +21,8 @@ class functionReplaceCache;
// An abstract interface to functions // An abstract interface to functions
// more explanation at the head of this file // more explanation at the head of this file
class function { class function {
static functionConstant *_timeFunction; static functionConstant *_timeFunction;
static functionConstant *_dtFunction;
public : public :
class argument { class argument {
//iMap is the id of the dataCacheMap, e.g. on interfaces //iMap is the id of the dataCacheMap, e.g. on interfaces
...@@ -75,6 +76,7 @@ class function { ...@@ -75,6 +76,7 @@ class function {
static function *getParametricCoordinates(); static function *getParametricCoordinates();
static function *getNormals(); static function *getNormals();
static functionConstant *getTime(); static functionConstant *getTime();
static functionConstant *getDT();
}; };
// dataCache when the value is a matrix of double // dataCache when the value is a matrix of double
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment