Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
pugs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
code
pugs
Commits
5b575bcf
Commit
5b575bcf
authored
4 months ago
by
Stéphane Del Pino
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' into feature/reconstruction
parents
effbab6b
cbaa3050
Branches
Branches containing commit
No related tags found
1 merge request
!205
High-order polynomial reconstruction
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+19
-15
19 additions, 15 deletions
CMakeLists.txt
tools/plugin-template/README.md-template
+9
-6
9 additions, 6 deletions
tools/plugin-template/README.md-template
with
28 additions
and
21 deletions
CMakeLists.txt
+
19
−
15
View file @
5b575bcf
...
@@ -178,6 +178,7 @@ if (PUGS_ENABLE_PETSC MATCHES "^(AUTO|ON)$")
...
@@ -178,6 +178,7 @@ if (PUGS_ENABLE_PETSC MATCHES "^(AUTO|ON)$")
# PETSc support is deactivated if MPI is not found
# PETSc support is deactivated if MPI is not found
pkg_check_modules
(
PETSC IMPORTED_TARGET GLOBAL PETSc
)
pkg_check_modules
(
PETSC IMPORTED_TARGET GLOBAL PETSc
)
if
(
${
PETSC_FOUND
}
)
set_property
(
TARGET PkgConfig::PETSC PROPERTY
set_property
(
TARGET PkgConfig::PETSC PROPERTY
IMPORTED_LOCATION
"
${
PETSC_LIBRARIES
}
"
IMPORTED_LOCATION
"
${
PETSC_LIBRARIES
}
"
)
)
...
@@ -186,6 +187,7 @@ if (PUGS_ENABLE_PETSC MATCHES "^(AUTO|ON)$")
...
@@ -186,6 +187,7 @@ if (PUGS_ENABLE_PETSC MATCHES "^(AUTO|ON)$")
)
)
set
(
PETSC_TARGET PkgConfig::PETSC
)
set
(
PETSC_TARGET PkgConfig::PETSC
)
endif
()
else
()
else
()
message
(
STATUS
"PETSc support is deactivated since pugs will not be build with MPI support"
)
message
(
STATUS
"PETSc support is deactivated since pugs will not be build with MPI support"
)
set
(
PETSC_FOUND FALSE
)
set
(
PETSC_FOUND FALSE
)
...
@@ -215,6 +217,7 @@ if (PUGS_ENABLE_SLEPC MATCHES "^(AUTO|ON)$")
...
@@ -215,6 +217,7 @@ if (PUGS_ENABLE_SLEPC MATCHES "^(AUTO|ON)$")
# SLEPc support is deactivated if PETSc is not found
# SLEPc support is deactivated if PETSc is not found
pkg_check_modules
(
SLEPC IMPORTED_TARGET GLOBAL SLEPc
)
pkg_check_modules
(
SLEPC IMPORTED_TARGET GLOBAL SLEPc
)
if
(
${
SLEPC_FOUND
}
)
set_property
(
TARGET PkgConfig::SLEPC PROPERTY
set_property
(
TARGET PkgConfig::SLEPC PROPERTY
IMPORTED_LOCATION
"
${
SLEPC_LIBRARIES
}
"
IMPORTED_LOCATION
"
${
SLEPC_LIBRARIES
}
"
)
)
...
@@ -223,6 +226,7 @@ if (PUGS_ENABLE_SLEPC MATCHES "^(AUTO|ON)$")
...
@@ -223,6 +226,7 @@ if (PUGS_ENABLE_SLEPC MATCHES "^(AUTO|ON)$")
)
)
set
(
SLEPC_TARGET PkgConfig::SLEPC
)
set
(
SLEPC_TARGET PkgConfig::SLEPC
)
endif
()
else
()
else
()
message
(
STATUS
"SLEPc support is deactivated since pugs will not be build with PETSc support"
)
message
(
STATUS
"SLEPc support is deactivated since pugs will not be build with PETSc support"
)
set
(
SLEPC_FOUND FALSE
)
set
(
SLEPC_FOUND FALSE
)
...
@@ -289,7 +293,7 @@ if (PUGS_ENABLE_HDF5 MATCHES "^(AUTO|ON)$")
...
@@ -289,7 +293,7 @@ if (PUGS_ENABLE_HDF5 MATCHES "^(AUTO|ON)$")
set
(
PUGS_HAS_HDF5
${
HDF5_FOUND
}
)
set
(
PUGS_HAS_HDF5
${
HDF5_FOUND
}
)
else
()
else
()
unset
(
HIGHFIVE_TARGET
)
unset
(
HIGHFIVE_TARGET
)
unset
(
HDF5_TARGET
PkgConfig::HDF5
)
unset
(
HDF5_TARGET
)
unset
(
PUGS_HAS_HDF5
)
unset
(
PUGS_HAS_HDF5
)
endif
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
tools/plugin-template/README.md-template
+
9
−
6
View file @
5b575bcf
...
@@ -11,9 +11,9 @@ Building this plugin requires an **installed** version of `pugs`.
...
@@ -11,9 +11,9 @@ Building this plugin requires an **installed** version of `pugs`.
Before building `pugs` one should define its installation directory.
Before building `pugs` one should define its installation directory.
In the `pugs` compilation directory one should execute
In the `pugs` compilation directory one should execute
```shell
```shell
cmake -DCMAKE_INSTALL_PREFIX=pugs_install_dir
...
cmake -DCMAKE_INSTALL_PREFIX=
[
pugs_install_dir
] [pugs_src_path] [
...
]
```
```
where `pugs_install_dir` is the chosen installation directory.
where `
[
pugs_install_dir
]
` is the chosen installation directory.
Then one simply runs
Then one simply runs
```shell
```shell
...
@@ -30,12 +30,12 @@ make install
...
@@ -30,12 +30,12 @@ make install
> is not able to remove them, to avoid the risk of compilation issues,
> is not able to remove them, to avoid the risk of compilation issues,
> one has to dot it manually...
> one has to dot it manually...
In the build directory one runs
In the
plugin
build directory one runs
```shell
```shell
cmake -DPUGS_PREFIX_PATH=pugs_install_dir
_PLUGIN_LOW__dir
cmake -DPUGS_PREFIX_PATH=
[
pugs_install_dir
] [
_PLUGIN_LOW__
src_
dir
]
```
```
where `pugs_install_dir` has the same value as above and `_PLUGIN_LOW__dir`
where `
[
pugs_install_dir
]
` has the same value as above and `
[
_PLUGIN_LOW__
src_
dir
]
`
is the directory that contains this `README.md` file.
is the
plugin source
directory that contains this `README.md` file.
Then to build the plugin, one runs
Then to build the plugin, one runs
```shell
```shell
...
@@ -65,3 +65,6 @@ export PUGS_PLUGIN_DIR="/pathtoplugin1;/pathtoplugin2"
...
@@ -65,3 +65,6 @@ export PUGS_PLUGIN_DIR="/pathtoplugin1;/pathtoplugin2"
```
```
Then one launches `pugs` classically.
Then one launches `pugs` classically.
```shell
[pugs_install_dir]/bin/pugs [script.pgs]
```
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment