ASCEE/timedomainresonace
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Working! Finally. Stupid mistake

Browse Source
This commit is contained in:
J.A. de Jong @ vulgaris 2015-02-22 10:19:27 +01:00
parent ad6c6800fa
commit 55170494e3
4 changed files with 32 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -14,8 +14,7 @@ SET(CMAKE_SWIG_FLAGS "-Wall")
add_definitions(-DNDEBUG) #This is for BOOST functions, and to disable assertions! add_definitions(-DNDEBUG) #This is for BOOST functions, and to disable assertions!
# add_definitions(-DTRACER=0) # add_definitions(-DTRACER=0)
add_definitions(-DEIGEN_NO_DEBUG -DARMA_NO_DEBUG) add_definitions(-DEIGEN_NO_DEBUG -DARMA_NO_DEBUG)
add_definitions(-DTRACERNAME=timedomaineulertracer)
add_definitions(-DTRACERNAME=timedomaineulertracer -DARMA_USE_BLAS -DARMA_USE_LAPACK)
############################## Not so often changed ############################## Not so often changed
@ -53,8 +52,6 @@ link_directories(/home/anne/bin/lib)
add_library(sources ${src}) add_library(sources ${src})
set_source_files_properties(timedomain.i PROPERTIES CPLUSPLUS ON) set_source_files_properties(timedomain.i PROPERTIES CPLUSPLUS ON)
set_source_files_properties(timedomain.i PROPERTIES SWIG_FLAGS "-py3") set_source_files_properties(timedomain.i PROPERTIES SWIG_FLAGS "-py3")
set_source_files_properties(timedomain.i PROPERTIES SWIG_FLAGS "-Wextra")
set_source_files_properties(timedomain.i PROPERTIES SWIG_FLAGS "-includeall")
swig_add_module(timedomaineuler python timedomain.i) swig_add_module(timedomaineuler python timedomain.i)
swig_link_libraries(timedomaineuler sources nonlin armadillo ${PYTHON_LIBRARIES}) swig_link_libraries(timedomaineuler sources nonlin armadillo ${PYTHON_LIBRARIES})

75
Plot data.ipynb
View File

File diff suppressed because one or more lines are too long

6
src/tube.cpp
View File

@ -65,13 +65,13 @@ void TubeLF::Integrate(d dt) {
{ // Inner nodes { // Inner nodes
d lambda = dt/(2*dx); d lambda = dt/(2*dx);
rho.subvec(1,gp-2)=0.5*(oldrho.head(gp-2) + oldrho.tail(gp-2)); rho.subvec(1,gp-2)=0.5*(oldrho.head(gp-2) + oldrho.tail(gp-2));
rho.subvec(1,gp-2)+=-lambda*(Cflux.head(gp-2) -Cflux.tail(gp-2)); rho.subvec(1,gp-2)+=-lambda*(Cflux.tail(gp-2) -Cflux.head(gp-2));
m.subvec(1,gp-2)=0.5*(oldm.head(gp-2) + oldm.tail(gp-2)); m.subvec(1,gp-2)=0.5*(oldm.head(gp-2) + oldm.tail(gp-2));
m.subvec(1,gp-2)+=-lambda*(Mflux.head(gp-2) -Mflux.tail(gp-2)); m.subvec(1,gp-2)+=-lambda*(Mflux.tail(gp-2) -Mflux.head(gp-2));
rhoE.subvec(1,gp-2)=0.5*(oldrhoE.head(gp-2) + oldrhoE.tail(gp-2)); rhoE.subvec(1,gp-2)=0.5*(oldrhoE.head(gp-2) + oldrhoE.tail(gp-2));
rhoE.subvec(1,gp-2)+=-lambda*(Eflux.head(gp-2) -Eflux.tail(gp-2)); rhoE.subvec(1,gp-2)+=-lambda*(Eflux.tail(gp-2) -Eflux.head(gp-2));
} // End inner nodes } // End inner nodes
{ // Right boundary { // Right boundary

188
timedomain.ipynb
View File

File diff suppressed because one or more lines are too long