Skip to content

Commit 326dcfa

Browse files
mknaranjaPhilou31
mknaranja
and
Philou31
authored
51 small adaptations of run script output and plot for scaling experiment (#53)
Co-authored-by: Philou31 <[email protected]>
1 parent 6a0625f commit 326dcfa

41 files changed

Lines changed: 1362 additions & 466 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 273 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,273 @@
1+
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
2+
3+
# dependencies
4+
/.pnp
5+
.pnp.js
6+
7+
# misc
8+
.DS_Store
9+
.env.local
10+
.env.development.local
11+
.env.test.local
12+
.env.production.local
13+
*.xls
14+
*.xlsx
15+
*.zip
16+
*.tar.gz
17+
*.csv
18+
*slurm*
19+
20+
# Created by https://www.gitignore.io/api/c++,node,python
21+
# Edit at https://www.gitignore.io/?templates=c++,node,python
22+
23+
### C++ ###
24+
# Prerequisites
25+
*.d
26+
27+
# Compiled Object files
28+
*.slo
29+
*.lo
30+
*.o
31+
*.obj
32+
33+
# Precompiled Headers
34+
*.gch
35+
*.pch
36+
37+
# Compiled Dynamic libraries
38+
*.so
39+
*.dylib
40+
*.dll
41+
42+
# Fortran module files
43+
*.mod
44+
*.smod
45+
46+
# Compiled Static libraries
47+
*.lai
48+
*.la
49+
*.a
50+
*.lib
51+
52+
# Executables
53+
*.exe
54+
*.out
55+
*.app
56+
57+
### Node ###
58+
# Logs
59+
logs
60+
*.log
61+
npm-debug.log*
62+
yarn-debug.log*
63+
yarn-error.log*
64+
lerna-debug.log*
65+
66+
# Diagnostic reports (https://nodejs.org/api/report.html)
67+
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
68+
69+
# Runtime data
70+
pids
71+
*.pid
72+
*.seed
73+
*.pid.lock
74+
75+
# Directory for instrumented libs generated by jscoverage/JSCover
76+
lib-cov
77+
78+
# Coverage directory used by tools like istanbul
79+
coverage
80+
*.lcov
81+
82+
# nyc test coverage
83+
.nyc_output
84+
85+
# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
86+
.grunt
87+
88+
# Bower dependency directory (https://bower.io/)
89+
bower_components
90+
91+
# node-waf configuration
92+
.lock-wscript
93+
94+
# Compiled binary addons (https://nodejs.org/api/addons.html)
95+
build/Release
96+
97+
# Dependency directories
98+
node_modules/
99+
jspm_packages/
100+
101+
# TypeScript v1 declaration files
102+
typings/
103+
104+
# TypeScript cache
105+
*.tsbuildinfo
106+
107+
# Optional npm cache directory
108+
.npm
109+
110+
# Optional eslint cache
111+
.eslintcache
112+
113+
# Optional REPL history
114+
.node_repl_history
115+
116+
# Output of 'npm pack'
117+
*.tgz
118+
119+
# Yarn Integrity file
120+
.yarn-integrity
121+
122+
# dotenv environment variables file
123+
.env
124+
.env.test
125+
126+
# parcel-bundler cache (https://parceljs.org/)
127+
.cache
128+
129+
# next.js build output
130+
.next
131+
132+
# nuxt.js build output
133+
.nuxt
134+
135+
# rollup.js default build output
136+
dist/
137+
138+
# Uncomment the public line if your project uses Gatsby
139+
# https://nextjs.org/blog/next-9-1#public-directory-support
140+
# https://create-react-app.dev/docs/using-the-public-folder/#docsNav
141+
# public
142+
143+
# Storybook build outputs
144+
.out
145+
.storybook-out
146+
147+
# vuepress build output
148+
.vuepress/dist
149+
150+
# Serverless directories
151+
.serverless/
152+
153+
# FuseBox cache
154+
.fusebox/
155+
156+
# DynamoDB Local files
157+
.dynamodb/
158+
159+
# Temporary folders
160+
tmp/
161+
temp/
162+
163+
### Python ###
164+
# Pycharm
165+
.idea
166+
167+
# Byte-compiled / optimized / DLL files
168+
__pycache__/
169+
*.py[cod]
170+
*$py.class
171+
172+
# C extensions
173+
174+
# Distribution / packaging
175+
.Python
176+
build/
177+
develop-eggs/
178+
downloads/
179+
eggs/
180+
.eggs/
181+
lib/
182+
lib64/
183+
parts/
184+
sdist/
185+
var/
186+
wheels/
187+
pip-wheel-metadata/
188+
share/python-wheels/
189+
*.egg-info/
190+
.installed.cfg
191+
*.egg
192+
MANIFEST
193+
_skbuild/
194+
195+
# PyInstaller
196+
# Usually these files are written by a python script from a template
197+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
198+
*.manifest
199+
*.spec
200+
201+
# Installer logs
202+
pip-log.txt
203+
pip-delete-this-directory.txt
204+
205+
# Unit test / coverage reports
206+
htmlcov/
207+
.tox/
208+
.nox/
209+
.coverage
210+
.coverage.*
211+
nosetests.xml
212+
coverage.xml
213+
*.cover
214+
.hypothesis/
215+
.pytest_cache/
216+
217+
# Translations
218+
*.mo
219+
*.pot
220+
221+
# Scrapy stuff:
222+
.scrapy
223+
224+
# Sphinx documentation
225+
docs/_build/
226+
227+
# PyBuilder
228+
target/
229+
230+
# pyenv
231+
.python-version
232+
233+
# pipenv
234+
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
235+
# However, in case of collaboration, if having platform-specific dependencies or dependencies
236+
# having no cross-platform support, pipenv may install dependencies that don't work, or not
237+
# install all needed dependencies.
238+
#Pipfile.lock
239+
240+
# celery beat schedule file
241+
celerybeat-schedule
242+
243+
# SageMath parsed files
244+
*.sage.py
245+
246+
# Spyder project settings
247+
.spyderproject
248+
.spyproject
249+
250+
# Rope project settings
251+
.ropeproject
252+
253+
# Mr Developer
254+
.mr.developer.cfg
255+
.project
256+
.pydevproject
257+
258+
# mkdocs documentation
259+
/site
260+
261+
# mypy
262+
.mypy_cache/
263+
.dmypy.json
264+
dmypy.json
265+
266+
# Pyre type checker
267+
.pyre/
268+
269+
# Docs
270+
docs/html
271+
docs/xml
272+
273+
# End of https://www.gitignore.io/api/c++,node,python

‎CMakeLists.txt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ project(GMGPolar VERSION 1.0.0)
44

55
option(GMGPOLAR_BUILD_TESTS "Build GMGPolar unit tests." ON)
66
option(GMGPOLAR_USE_MUMPS "Use MUMPS to compute matrix factorizations." OFF)
7+
option(GMGPOLAR_USE_LIKWID "Use LIKWID to measure code (regions)." OFF)
8+
79

810
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
911
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -42,6 +44,18 @@ configure_file(${CMAKE_SOURCE_DIR}/include/config_internal.h.in ${CMAKE_SOURCE_D
4244
target_include_directories(gmgpolar_simulation PRIVATE ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/include/test_cases )
4345
target_include_directories(GMGPolar PRIVATE ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/include/test_cases )
4446

47+
if(GMGPOLAR_USE_LIKWID)
48+
49+
find_package(LIKWID REQUIRED)
50+
51+
target_include_directories(GMGPolar PUBLIC ${LIKWID_INCLUDE_DIRS})
52+
target_link_libraries(GMGPolar PUBLIC ${LIKWID_LIBRARIES})
53+
target_compile_definitions(GMGPolar PUBLIC "-DLIKWID_PERFMON")
54+
55+
endif()
56+
57+
58+
4559
if(GMGPOLAR_USE_MUMPS)
4660

4761
set(INC_DIRS

‎include/config_internal.h.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,6 @@
2828
#define GMGPOLAR_CONFIG_INTERNAL_H
2929

3030
#cmakedefine GMGPOLAR_USE_MUMPS
31+
#cmakedefine GMGPOLAR_USE_LIKWID
3132

3233
#endif // GMGPOLAR_CONFIG_INTERNAL_H

‎include/constants.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ domains with the method of characteristics and spline finite elements. (2019)
245245
*
246246
* Defines the coefficient
247247
* 0: beta = 0
248-
* 1: beta = (1 / alpha)
248+
* 1: beta: 1/alpha for some cases, different in others (see coeffs in test_cases)
249249
*/
250250
beta_coeff,
251251
/*! \brief Norm for stopping criterion
@@ -316,8 +316,8 @@ enum dcontrols
316316
rel_red_conv,
317317
/*! \brief Timings
318318
*/
319-
t_coeff,
320-
t_arr_art_att,
319+
t_arr_art_att, // Evaluation of arr, art, and att
320+
t_coeff, // Evaluation of alpha and beta (subcounter of t_arr_art_att)
321321
t_sol,
322322
t_detDFinv,
323323
t_trafo,

0 commit comments

Comments
 (0)