Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: coolfluid/coolfluid3
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: tbanyai/coolfluid3
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Apr 23, 2012

  1. [ENH] pulled in Vivian Bolsee's improvements.

    Tamas Banyai committed Apr 23, 2012
    Copy the full SHA
    4e03b35 View commit details
Showing with 9 additions and 8 deletions.
  1. +2 −2 cf3/common/XML/SignalFrame.cpp
  2. +1 −0 cf3/ui/graphics/CMakeLists.txt
  3. +6 −6 plugins/RDM/test/atest-rdm-rk-lineuler2d.py
4 changes: 2 additions & 2 deletions cf3/common/XML/SignalFrame.cpp
View file
Original file line number Diff line number Diff line change
@@ -618,7 +618,7 @@ std::string SignalFrame::to_python_script( int indentation ) const //add uri par
str += ',' + opt;
}
}
str+=')\n';
str+=")\n";
}else{
str+="."+target+"(";
SignalFrame frame( *this );
@@ -665,7 +665,7 @@ std::string SignalFrame::to_python_script( int indentation ) const //add uri par
else
str += "," + opt;
}
str+=')\n';
str+=")\n";
}
str.resize(str.size()-1);//to remove the last character
return str;
1 change: 1 addition & 0 deletions cf3/ui/graphics/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -126,6 +126,7 @@ list( APPEND coolfluid_ui_graphics_files
list( APPEND coolfluid_ui_graphics_cflibs coolfluid_ui_core )
# Use Qt Libraries
list( APPEND coolfluid_ui_graphics_libs ${QT_LIBRARIES} coolfluid_qwt coolfluid_fparser ${Boost_PYTHON_LIBRARY} ${PYTHON_LIBRARIES})
list( APPEND coolfluid_ui_graphics_includedirs ${PYTHON_INCLUDE_DIR})

QT4_ADD_RESOURCES(coolfluid_ui_graphics_RCC Resources/coolfluid-client.qrc)

12 changes: 6 additions & 6 deletions plugins/RDM/test/atest-rdm-rk-lineuler2d.py
View file
Original file line number Diff line number Diff line change
@@ -25,16 +25,16 @@
### read mesh

domain = model.get_child('Domain')
mesh = domain.load_mesh(file=cf.URI('circle150r-tg-p1-3471.msh', cf.URI.Scheme.file), name='mesh')
#mesh = domain.load_mesh(file=cf.URI('circle.msh', cf.URI.Scheme.file), name='mesh')
#mesh = domain.load_mesh(file=cf.URI('circle150r-tg-p1-3471.msh', cf.URI.Scheme.file), name='mesh')
mesh = domain.load_mesh(file=cf.URI('circle.msh', cf.URI.Scheme.file), name='mesh')

internal_regions = [cf.URI('//Model/Domain/mesh/topology/domain')]

### solver

solver = model.get_child('RDSolver')
solver.options().configure_option('update_vars', 'Cons2D')
solver.options().configure_option('solution_space', 'LagrangeP1')
solver.options().configure_option('solution_space', 'LagrangeP2B')

#print("----------------------------------------------------------------------------------------------------------")
#solver.get_child('TimeStepping').list_options_recursive()
@@ -47,7 +47,7 @@

solver.get_child('TimeStepping').get_child('Time').options().configure_option('time_step', 0.13)
solver.get_child('TimeStepping').get_child('Time').options().configure_option('end_time', 50.)
solver.get_child('TimeStepping').get_child('MaxIterations').options().configure_option('maxiter', 10)
solver.get_child('TimeStepping').get_child('MaxIterations').options().configure_option('maxiter', 100)
solver.get_child('IterativeSolver').get_child('Update').get_child('Step').options().configure_option('cfl', 1.) #0.25)
solver.get_child('IterativeSolver').get_child('Update').get_child('Step').options().configure_option('regions', internal_regions)

@@ -133,8 +133,8 @@
#tecplot_writer.options().configure_option('file',cf.URI('file:final.plt'))
#tecplot_writer.execute()

import networkxpython as nx
nx.show_graph(cf.URI('//Model/Domain/mesh'),depth=1000,tree='clf',caption='clf',printdestination='s',hidden='')#
#import networkxpython as nx
#nx.show_graph(cf.URI('//Model/Domain/mesh'),depth=1000,tree='clf',caption='clf',printdestination='s',hidden='')#
#nx.show_graph(solver.uri(),depth=1000,tree='coltf',caption='coltf',printdestination='s',hidden='')