Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-gfe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
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
Sander, Oliver
dune-gfe
Commits
05b545c3
Commit
05b545c3
authored
3 years ago
by
Lisa Julia Nebel
Browse files
Options
Downloads
Patches
Plain Diff
Pull the 2.7 branches of all modules when running the CI-tests for dune-2.7
parent
39616a6b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!81
Fix error in surfacecosseratenergy
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+2
-0
2 additions, 0 deletions
.gitlab-ci.yml
src/CMakeLists.txt
+4
-3
4 additions, 3 deletions
src/CMakeLists.txt
test/CMakeLists.txt
+10
-2
10 additions, 2 deletions
test/CMakeLists.txt
with
16 additions
and
5 deletions
.gitlab-ci.yml
+
2
−
0
View file @
05b545c3
...
...
@@ -29,6 +29,8 @@ before_script: &before
EOT
dune:2.7 gcc
:
variables
:
DUNECI_BRANCH
:
releases/2.7
image
:
registry.dune-project.org/docker/ci/dune:2.7-debian-10-gcc-8-17
before_script
:
-
*patch-dune-common
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
4
−
3
View file @
05b545c3
set
(
programs compute-disc-error
cosserat-continuum
gradient-flow
harmonicmaps
rod3d
)
harmonicmaps
)
# rodobstacle)
if
(
${
DUNE_COMMON_VERSION
}
VERSION_GREATER_EQUAL 2.8
)
set
(
programs rod3d
${
programs
}
)
endif
()
if
(
${
DUNE_ELASTICITY_VERSION
}
VERSION_GREATER_EQUAL 2.8
)
set
(
programs film-on-substrate-stress-plot
${
programs
}
)
endif
()
...
...
This diff is collapsed.
Click to expand it.
test/CMakeLists.txt
+
10
−
2
View file @
05b545c3
...
...
@@ -3,7 +3,6 @@ set(TESTS
averagedistanceassemblertest
cosseratenergytest
cosseratrodenergytest
cosseratrodtest
harmonicenergytest
localgeodesicfefunctiontest
localgfetestfunctiontest
...
...
@@ -11,11 +10,18 @@ set(TESTS
orthogonalmatrixtest
rigidbodymotiontest
rotationtest
surfacecosseratstressassemblertest
svdtest
targetspacetest
)
if
(
${
DUNE_COMMON_VERSION
}
VERSION_GREATER_EQUAL 2.8
)
set
(
TESTS cosseratrodtest
${
TESTS
}
)
endif
()
if
(
${
DUNE_COMMON_VERSION
}
VERSION_GREATER_EQUAL 2.8
)
set
(
TESTS surfacecosseratstressassemblertest
${
TESTS
}
)
endif
()
if
(
dune-foamgrid_FOUND
)
set
(
TESTS nonplanarcosseratenergytest
${
TESTS
}
)
endif
()
...
...
@@ -26,10 +32,12 @@ foreach(_test ${TESTS})
endforeach
()
# Run distributed tests
if
(
${
DUNE_COMMON_VERSION
}
VERSION_GREATER_EQUAL 2.8
)
dune_add_test
(
SOURCES harmonicmaptest.cc
MPI_RANKS 1 4
TIMEOUT 600
CMAKE_GUARD MPI_FOUND
)
endif
()
dune_add_test
(
SOURCES geodesicfeassemblerwrappertest.cc
MPI_RANKS 1 4
...
...
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