SciCompMod · mknaranja · Dec 12, 2023 · Oct 6, 2023 · Oct 9, 2023 · Oct 9, 2023
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,273 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/.pnp
+.pnp.js
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+*.xls
+*.xlsx
+*.zip
+*.tar.gz
+*.csv
+*slurm*
+
+# Created by https://www.gitignore.io/api/c++,node,python
+# Edit at https://www.gitignore.io/?templates=c++,node,python
+
+### C++ ###
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+.env.test
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# next.js build output
+.next
+
+# nuxt.js build output
+.nuxt
+
+# rollup.js default build output
+dist/
+
+# Uncomment the public line if your project uses Gatsby
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# https://create-react-app.dev/docs/using-the-public-folder/#docsNav
+# public
+
+# Storybook build outputs
+.out
+.storybook-out
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# Temporary folders
+tmp/
+temp/
+
+### Python ###
+# Pycharm
+.idea
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+_skbuild/
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# Mr Developer
+.mr.developer.cfg
+.project
+.pydevproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# Docs
+docs/html
+docs/xml
+
+# End of https://www.gitignore.io/api/c++,node,python
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,6 +4,8 @@ project(GMGPolar VERSION 1.0.0)
 
 option(GMGPOLAR_BUILD_TESTS "Build GMGPolar unit tests." ON)
 option(GMGPOLAR_USE_MUMPS "Use MUMPS to compute matrix factorizations." OFF)
+option(GMGPOLAR_USE_LIKWID "Use LIKWID to measure code (regions)." OFF)
+
 
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -42,6 +44,18 @@ configure_file(${CMAKE_SOURCE_DIR}/include/config_internal.h.in ${CMAKE_SOURCE_D
 target_include_directories(gmgpolar_simulation PRIVATE ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/include/test_cases )
 target_include_directories(GMGPolar PRIVATE ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/include/test_cases )
 
+if(GMGPOLAR_USE_LIKWID)
+
+    find_package(LIKWID REQUIRED)
+
+    target_include_directories(GMGPolar PUBLIC ${LIKWID_INCLUDE_DIRS})
+    target_link_libraries(GMGPolar PUBLIC ${LIKWID_LIBRARIES})
+    target_compile_definitions(GMGPolar PUBLIC "-DLIKWID_PERFMON")
+
+endif()
+
+
+
 if(GMGPOLAR_USE_MUMPS)
 
     set(INC_DIRS

diff --git a/include/config_internal.h.in b/include/config_internal.h.in
@@ -28,5 +28,6 @@
 #define GMGPOLAR_CONFIG_INTERNAL_H
 
 #cmakedefine GMGPOLAR_USE_MUMPS
+#cmakedefine GMGPOLAR_USE_LIKWID
 
 #endif // GMGPOLAR_CONFIG_INTERNAL_H
diff --git a/include/constants.h b/include/constants.h
@@ -245,7 +245,7 @@ domains with the method of characteristics and spline finite elements.  (2019)
          *
          * Defines the coefficient
          * 0: beta = 0
-         * 1: beta = (1 / alpha)
+         * 1: beta: 1/alpha for some cases, different in others (see coeffs in test_cases)
          */
     beta_coeff,
     /*! \brief Norm for stopping criterion
@@ -316,8 +316,8 @@ enum dcontrols
     rel_red_conv,
     /*! \brief Timings
          */
-    t_coeff,
-    t_arr_art_att,
+    t_arr_art_att, // Evaluation of arr, art, and att
+    t_coeff, // Evaluation of alpha and beta (subcounter of t_arr_art_att)    
     t_sol,
     t_detDFinv,
     t_trafo,