Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Update NekRS to next #987

Open
wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

WIP: Update NekRS to next #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 35 additions & 18 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ HEAT_TRANSFER := yes
NAVIER_STOKES := yes
REACTOR := yes
SOLID_PROPERTIES := yes
STOCHASTIC_TOOLS := yes
STOCHASTIC_TOOLS := no
SOLID_MECHANICS := yes
THERMAL_HYDRAULICS := yes

Expand All @@ -128,39 +128,56 @@ NEKRS_BUILDDIR := $(CARDINAL_DIR)/build/nekrs
NEKRS_INSTALL_DIR := $(CONTRIB_INSTALL_DIR)
NEKRS_INCLUDES := \
-I$(NEKRS_DIR)/src \
-I$(NEKRS_DIR)/src/bdry \
-I$(NEKRS_DIR)/src/bench/advsub \
-I$(NEKRS_DIR)/src/bench/axHelm \
-I$(NEKRS_DIR)/src/bench/core \
-I$(NEKRS_DIR)/src/bench/fdm \
-I$(NEKRS_DIR)/src/cds \
-I$(NEKRS_DIR)/src/core \
-I$(NEKRS_DIR)/src/findpts \
-I$(NEKRS_DIR)/src/io \
-I$(NEKRS_DIR)/src/core/linAlg \
-I$(NEKRS_DIR)/src/core/linAlg/kernels \
-I$(NEKRS_DIR)/src/core/io \
-I$(NEKRS_DIR)/src/core/ogs \
-I$(NEKRS_DIR)/src/core/ogs/kernels \
-I$(NEKRS_DIR)/src/core/kernels \
-I$(NEKRS_DIR)/src/elliptic \
-I$(NEKRS_DIR)/src/elliptic/MG \
-I$(NEKRS_DIR)/src/elliptic/linearSolver \
-I$(NEKRS_DIR)/src/elliptic/kernels \
-I$(NEKRS_DIR)/src/elliptic/amgSolver \
-I$(NEKRS_DIR)/src/elliptic/amgSolver/amgx \
-I$(NEKRS_DIR)/src/elliptic/amgSolver/hypre \
-I$(NEKRS_DIR)/src/lib \
-I$(NEKRS_DIR)/src/linAlg \
-I$(NEKRS_DIR)/src/mesh \
-I$(NEKRS_DIR)/src/navierStokes \
-I$(NEKRS_DIR)/src/nekInterface \
-I$(NEKRS_DIR)/src/neknek \
-I$(NEKRS_DIR)/src/mesh/kernels \
-I$(NEKRS_DIR)/src/nrs \
-I$(NEKRS_DIR)/src/nrs/nekInterface \
-I$(NEKRS_DIR)/src/nrs/plugins \
-I$(NEKRS_DIR)/src/nrs/plugins/kernels \
-I$(NEKRS_DIR)/src/nrs/kernels \
-I$(NEKRS_DIR)/src/nrs/bdry \
-I$(NEKRS_DIR)/src/nrs/cds \
-I$(NEKRS_DIR)/src/nrs/cds/regularization \
-I$(NEKRS_DIR)/src/nrs/cds/regularization/kernels \
-I$(NEKRS_DIR)/src/nrs/cds/cvode \
-I$(NEKRS_DIR)/src/nrs/cds/cvode/kernels \
-I$(NEKRS_DIR)/src/nrs/cds/kernels \
-I$(NEKRS_DIR)/src/nrs/postProcessing \
-I$(NEKRS_DIR)/src/nrs/postProcessing/kernels \
-I$(NEKRS_DIR)/src/nrs/neknek \
-I$(NEKRS_DIR)/src/nrs/neknek/kernels \
-I$(NEKRS_DIR)/src/plugins \
-I$(NEKRS_DIR)/src/plugins/kernels \
-I$(NEKRS_DIR)/src/pointInterpolation \
-I$(NEKRS_DIR)/src/pointInterpolation/findpts \
-I$(NEKRS_DIR)/src/postProcessing \
-I$(NEKRS_DIR)/src/regularization \
-I$(NEKRS_DIR)/src/setup \
-I$(NEKRS_DIR)/src/solvers/cvode \
-I$(NEKRS_DIR)/src/solvers/elliptic \
-I$(NEKRS_DIR)/src/solvers/elliptic/amgSolver \
-I$(NEKRS_DIR)/src/solvers/elliptic/linearSolver \
-I$(NEKRS_DIR)/src/solvers/elliptic/MG \
-I$(NEKRS_DIR)/src/pointInterpolation/findpts/kernels \
-I$(NEKRS_DIR)/src/udf \
-I$(NEKRS_DIR)/src/utils \
-I$(NEKRS_INSTALL_DIR)/gatherScatter \
-I$(NEKRS_INSTALL_DIR)/include \
-I$(NEKRS_INSTALL_DIR)/libparanumal/include \
-I$(NEKRS_INSTALL_DIR)/include/libP/parAlmond \
-I$(NEKRS_INSTALL_DIR)/include/linAlg
-I$(NEKRS_INSTALL_DIR)/include/linAlg \
-I$(NEKRS_INSTALL_DIR)/include/core
NEKRS_LIBDIR := $(NEKRS_INSTALL_DIR)/lib
NEKRS_LIB := $(NEKRS_LIBDIR)/libnekrs.so
# This needs to be exported
Expand Down
2 changes: 1 addition & 1 deletion doc/content/news/july2024.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# July 2022 News
# July 2024 News

- A new [tally system](/actions/AddTallyAction.md) and an accompanying input syntax
block have been added to Cardinal
Expand Down
4 changes: 4 additions & 0 deletions include/base/NekInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

#include "inipp.hpp"
#include "nekrs.hpp"
#include "neknek.hpp"
#include "bcMap.hpp"
#include "udf.hpp"
#include "inipp.hpp"
Expand All @@ -47,6 +48,9 @@ namespace nekrs

static int build_only;

/// Obtain pointer to solver class in NekRS
nrs_t * nrsPtr();

/// Allocate memory for the host mesh parameters
void initializeHostMeshParameters();

Expand Down
2 changes: 1 addition & 1 deletion src/actions/NekInitAction.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ NekInitAction::validParams()
"this is <case> in <case>.par, <case>.udf, <case>.oudf, and <case>.re2.");

params.addParam<unsigned int>("n_usrwrk_slots", 7,
"Number of slots to allocate in nrs->usrwrk to hold fields either related to coupling "
"Number of slots to allocate in nekrs::usrwrk to hold fields either related to coupling "
"(which will be populated by Cardinal), or other custom usages, such as a distance-to-wall calculation");

return params;
Expand Down
Loading