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.

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

Multiple strain field names and updated distance to line function for rift.cc #3

Open
wants to merge 1,681 commits into
base: initial_composition_rift
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1681 commits
Select commit Hold shift + click to select a range
88a5423
added clarification to simple compressible model
bobmyhill Jun 26, 2018
0e91286
Merge pull request #2405 from pmbremner/parse_map_utility
gassmoeller Jun 26, 2018
f360dc8
Merge pull request #2475 from jaustermann/fix_typo
MFraters Jun 26, 2018
b6e3e13
Use the parameter GMRES restart length also for cheap iterations
gassmoeller Jun 26, 2018
39fd6c4
Fixed problem in TOC where the title overwrites the Appendix number.
egpuckett Jun 26, 2018
b5a5b39
Merge branch 'master' of https://github.com/geodynamics/aspect
egpuckett Jun 26, 2018
ab43f89
Merge branch 'ASPECT_Manual_TOC' of https://github.com/EGP-CIG-REU/as…
egpuckett Jun 26, 2018
b620418
Merge pull request #2473 from cedrict/correct_solcx_solkz_years
bangerth Jun 26, 2018
b0d0492
Merge pull request #2483 from gassmoeller/use_gmres_restart_length_fo…
bangerth Jun 26, 2018
538650d
Fixed problem in TOC where the title overwrites the Appendix number.
egpuckett Jun 26, 2018
825a3f2
Merge pull request #2472 from jdannberg/cookbook_update
bangerth Jun 26, 2018
0ed1add
simplified AssertThrow logic in utilities
wanyingw Jun 27, 2018
c7b2102
Merge pull request #2470 from MFraters/fix_newton_assembly_performance_3
gassmoeller Jun 27, 2018
de72eed
Make indentation of a comment more uniform.
bangerth Jun 27, 2018
5c85ffb
Set masks
anne-glerum Jun 27, 2018
d73c262
Merge pull request #2489 from wanyingw/utilities
MFraters Jun 27, 2018
f1f8c5e
Merge pull request #2495 from anne-glerum/fix_viscoelastic_volume_frac
naliboff Jun 27, 2018
7a13aec
write change log entry for the Newton solver assembly performace impr…
MFraters Jun 27, 2018
6476280
Merge pull request #2496 from MFraters/fix_newton_assembly_performanc…
gassmoeller Jun 27, 2018
58edf4b
Merge pull request #2493 from bangerth/indent
gassmoeller Jun 27, 2018
26c472e
Merge pull request #2484 from EGP-CIG-REU/ASPECT_Manual_TOC
bangerth Jun 27, 2018
81d7963
Fixed typo in comment
Jun 27, 2018
d891d5a
A couple of minimalist changes.
bangerth Jun 27, 2018
86caa2c
Merge pull request #2500 from pmbremner/fix_typo
bangerth Jun 27, 2018
652d6e1
structure for additional material model inputs
jdannberg Jun 21, 2018
058e804
move fill function to material model
jdannberg Jun 27, 2018
8803573
Merge pull request #2468 from bobmyhill/improve_compressible_doc
bangerth Jun 27, 2018
8de9016
Merge pull request #2501 from bangerth/cleanup
jdannberg Jun 27, 2018
c5e8f82
Add input files
anne-glerum Jun 27, 2018
bb6a7af
Move the check for reasonable parameters earlier in the function.
bangerth Jun 27, 2018
c64f522
Add Material model and postprocessor
anne-glerum Jun 27, 2018
d6f203a
Temporary commit while I work on the manuals TOC.
egpuckett Jun 27, 2018
ac72203
Add benchmark entry manual
anne-glerum Jun 27, 2018
b83a3c7
The page numbers in the TOC are now properly aligned in a column.
egpuckett Jun 27, 2018
b2927fe
Merge pull request #2508 from EGP-CIG-REU/ASPECT_Manual_TOC
bangerth Jun 27, 2018
eb1cae1
Fix formatting.
bangerth Jun 27, 2018
7740d85
Remove an unused variable.
bangerth Jun 27, 2018
fdd7917
added thermodynamic self-consistency section to the manual
bobmyhill Jun 27, 2018
65018ed
Fixed typos in manual
Jun 27, 2018
2b95456
Add changelog entry
anne-glerum Jun 27, 2018
abf4a57
Merge pull request #2512 from bangerth/unused
MFraters Jun 27, 2018
7edf23a
Merge pull request #2511 from bangerth/benchmarks
MFraters Jun 27, 2018
6722947
Merge pull request #2394 from anne-glerum/add_tosi_benchmark
bangerth Jun 27, 2018
f02a23f
fix latex markup
bartniday Jun 27, 2018
a1e5f5d
Merge pull request #2514 from lkellogg/fix_manual
bangerth Jun 27, 2018
1d9a9d5
Add test based on bending beam benchmark
naliboff Jun 27, 2018
8837f7e
Merge pull request #2502 from bangerth/improve
gassmoeller Jun 27, 2018
bab203b
Merge pull request #2519 from naliboff/add_viscoelastic_test
bangerth Jun 27, 2018
d7fe0fb
cmake: disallow in-source test runs
tjhei Jun 27, 2018
59e0466
promote out-of-source builds
tjhei Jun 27, 2018
14e93a9
Merge pull request #2518 from bartniday/patch-2
tjhei Jun 27, 2018
3053dbf
add .clang-tidy file and instructions
tjhei Jun 27, 2018
b643f52
Merge pull request #2522 from tjhei/clang-tidy
bangerth Jun 27, 2018
7d0a63e
Merge pull request #2521 from tjhei/manual-cmake-no-insource
bangerth Jun 27, 2018
be19816
address comments
jdannberg Jun 27, 2018
fd3be89
make it a fatal error
tjhei Jun 27, 2018
132dd37
Consistent notation for Ra_c in manual
Jun 28, 2018
361dc5a
Update manual.tex
bangerth Jun 28, 2018
639dd38
Let initial conditions use thermal expansivity from material model
bartniday Jun 27, 2018
3c5d286
Merge pull request #2524 from lkellogg/manual-Ra
bangerth Jun 28, 2018
8613ba4
Merge pull request #2517 from tjhei/cmake-no-insource-test
bangerth Jun 28, 2018
edcfb48
Only set time step number and timestep sizes after initialization is …
bangerth Jun 21, 2018
ba48dc1
Add changelog entry.
bangerth Jun 21, 2018
e3f5d8a
Avoid triggering a condition when timestep_number == invalid_unsigned…
bangerth Jun 23, 2018
8d16f55
Tighten the condition when one can ask for a point inside the domain.
bangerth Jun 27, 2018
b95999e
Fix an invalid access in a test.
bangerth Jun 27, 2018
6e10552
Make sure we run parts of the initialization even if we don't set ini…
bangerth Jun 28, 2018
ab3bc04
Do not try to compute the viscoelastic viscosity with an unknown time…
bangerth Jun 27, 2018
d577967
Added new authors from the 2018 Hackathon to the manual.
egpuckett Jun 28, 2018
6d65dcb
add comments
jdannberg Jun 28, 2018
617883a
Merge pull request #2528 from EGP-CIG-REU/new_ASPECT_manual_authors
anne-glerum Jun 28, 2018
f99e1b2
Merge pull request #2490 from jdannberg/additional_inputs
gassmoeller Jun 28, 2018
df97dcc
Merge pull request #2362 from bangerth/pre-initialize
gassmoeller Jun 28, 2018
e889122
moved and reworked section post-review
bobmyhill Jun 28, 2018
c68907f
Merge pull request #2513 from bobmyhill/doc_self_consistency
jdannberg Jun 28, 2018
3dd2d5b
manual: make compile and fixup tosi chapter
tjhei Jun 28, 2018
7ac052a
documentation: use \ast not *
tjhei Jun 28, 2018
75432e1
Merge pull request #2527 from tjhei/manual-fix-compile-tosi
bangerth Jun 29, 2018
f5e6a41
Merge pull request #2535 from tjhei/doc-no-asterisk
bangerth Jun 29, 2018
954831b
amend 2 references in manual
cedrict Jul 2, 2018
72c1684
test: function parser and if()
tjhei Jul 2, 2018
9ad9220
fix manual and doxygen errors
tjhei Jul 2, 2018
00cb227
update parameters
tjhei Jul 2, 2018
005d22c
Merge pull request #2541 from tjhei/maintenance_jul18
gassmoeller Jul 2, 2018
8541da9
Fixup style and messages
gassmoeller Jun 26, 2018
1c2c31c
Remove "bg" option, extend error message.
gassmoeller Jul 2, 2018
3dde523
Add option to use full A block as preconditioner
gassmoeller Jul 2, 2018
d67e3fa
corrected manual.bib
cedrict Jul 3, 2018
0c05117
Donea & Huerta benchmark code files
cedrict Jul 3, 2018
5d30a4c
manual entry for Donea and Huerta benchmark
cedrict Jul 3, 2018
bcdf3de
add test for Donea and Huerta benchmark
cedrict Jul 3, 2018
06589b8
change log entry for Donea & Huerta
cedrict Jul 3, 2018
88726b9
Merge pull request #2539 from cedrict/amend_manual_biblio
tjhei Jul 3, 2018
bfba623
Merge pull request #2540 from tjhei/test_function_parser_if
gassmoeller Jul 3, 2018
73c1063
Add Jenkinsfile for kubernetes Jenkins
gassmoeller Jul 3, 2018
86ad3fc
Address comments
gassmoeller Jul 4, 2018
f055083
Merge pull request #2545 from gassmoeller/jenkins-kubernetes
jdannberg Jul 4, 2018
e4f11e2
Change includes, update script.
gassmoeller Jun 25, 2018
158e75c
Update files
gassmoeller Jun 26, 2018
637a223
Merge pull request #2542 from gassmoeller/allow_full_A_block_precondi…
tjhei Jul 4, 2018
17ea333
Merge pull request #2485 from gassmoeller/fix_utilities_function
tjhei Jul 4, 2018
6dedba5
Minor update to the documentation of a parameter.
bangerth Jul 4, 2018
cddd9e1
Update find syntax in update script
gassmoeller Jul 4, 2018
0c18b24
Manual indentation fixes
gassmoeller Jun 26, 2018
e189fc9
Merge pull request #2481 from cedrict/DoneaHuertaBench
bangerth Jul 4, 2018
f9ef8af
Also delete manual.aux.
bangerth Jul 4, 2018
44007f3
Merge pull request #2548 from gassmoeller/update_update_script
bangerth Jul 4, 2018
3a152e3
Merge pull request #2547 from bangerth/parameter-doc
gassmoeller Jul 4, 2018
a0d09be
Remove a couple of stray characters from a comment.
bangerth Jul 4, 2018
a22b388
Minor latex updates.
bangerth Jul 4, 2018
d356d52
Trim white frame around a few pictures.
bangerth Jul 4, 2018
18d20bd
Trim white frame around a few pictures.
bangerth Jul 4, 2018
1f4a500
Merge pull request #2549 from bangerth/delete
gassmoeller Jul 4, 2018
4c7075e
Merge pull request #2550 from bangerth/donea
gassmoeller Jul 5, 2018
74b82b9
Keep idle kubernetes pods to refill with new jobs
gassmoeller Jul 4, 2018
1dadd32
Add time step check
anne-glerum Jul 2, 2018
f0df7de
layered flow analytical benchmark
cedrict Jun 27, 2018
41308f2
Merge pull request #2553 from bangerth/pictures-2
tjhei Jul 5, 2018
dda1208
Merge pull request #2552 from bangerth/pictures
tjhei Jul 5, 2018
6e9fdfc
Minor updates to the thermodynamics section of the manual.
bangerth Jul 5, 2018
78df606
Update a note in the manual.
bangerth Jul 5, 2018
0282fff
Merge pull request #2505 from cedrict/LayeredFlowBenchmark
bangerth Jul 5, 2018
115d35f
Remove white frame around pictures.
bangerth Jul 5, 2018
a7fc47a
Explain more what the purpose of the benchmark is.
bangerth Jul 5, 2018
0644c2e
Use the common symbol for the viscosity.
bangerth Jul 5, 2018
c0ea9fc
Merge pull request #2556 from bangerth/manual-update
jdannberg Jul 5, 2018
7ba8b9a
Make sure pictures are of the same height.
bangerth Jul 5, 2018
6e16b26
Minor text edits to the layered flow benchmark.
bangerth Jul 5, 2018
fbe7f2a
Add test for S40RTS initial condition
bartniday Jul 4, 2018
4a8948c
Merge pull request #2557 from bangerth/manual-update-2
gassmoeller Jul 5, 2018
fc32d93
Merge pull request #2520 from bartniday/s40rts-thermal-alpha
gassmoeller Jul 5, 2018
1307318
Merge pull request #2558 from bangerth/layered
gassmoeller Jul 5, 2018
d9f25d6
Merge pull request #2460 from gassmoeller/remove_cxx11_includes
gassmoeller Jul 5, 2018
455770c
Tester check for ready to test label
gassmoeller Jul 6, 2018
631b4e8
added small section on coefficient averaging
bobmyhill Jun 29, 2018
c5e6ce3
which compressibility
bobmyhill Jul 6, 2018
af5ae38
clarified 2.11.1, changed kappa to beta where necessary
bobmyhill Jul 6, 2018
401d683
Merge pull request #2554 from gassmoeller/update_kubernetes_file
gassmoeller Jul 6, 2018
3b7eed1
Merge pull request #2537 from bobmyhill/doc_property_averaging
bangerth Jul 6, 2018
5740093
Annulus benchmark
gassmoeller Jun 20, 2018
a8b3344
Remove usage of deprecated find_ functions
gassmoeller Jul 7, 2018
fcd631d
replace boost bind by lambdas
tjhei Jun 26, 2018
48a72e0
Merge pull request #2562 from gassmoeller/simplify_plugin_checks
tjhei Jul 7, 2018
91e61de
Merge pull request #2559 from gassmoeller/check_label
tjhei Jul 8, 2018
d3a35c0
address comments
tjhei Jul 8, 2018
7cacb6b
Merge pull request #2480 from tjhei/remove_bind
bangerth Jul 8, 2018
5d10eb9
Improve prm not found error
tjhei Jun 27, 2018
a9c8da7
addressed comments, added compressibilities to coefficients
bobmyhill Jul 7, 2018
7c8404d
Merge pull request #2561 from bobmyhill/which_compressibility
jdannberg Jul 8, 2018
4a725b7
Merge pull request #2563 from tjhei/improve_prm_not_found_error
gassmoeller Jul 9, 2018
2b1cb93
Adjust spacing between functions to our default.
bangerth Jul 9, 2018
e603c61
Move variable declarations right before the loop they control.
bangerth Jul 9, 2018
89ee159
Merge pull request #2565 from bangerth/cleanup
bangerth Jul 9, 2018
4884d03
Move variable declarations right before the loop they control.
bangerth Jul 9, 2018
2150267
Merge pull request #2566 from bangerth/cleanup
gassmoeller Jul 10, 2018
a6f1c48
Add initial temperature condition patch_on_S40RTS which combines S40R…
Jun 22, 2018
c1c8261
Address Rene's comments
Jul 9, 2018
83effc9
Fix test
Jul 9, 2018
016ed4e
Make no_perturbation_depth a parameter within patch_on_S40RTS rather …
Jul 10, 2018
4afd481
Replace the use of a separate index by cell->active_cell_index().
bangerth Jul 11, 2018
69e5b82
Replace the use of a separate index by cell->active_cell_index() in a…
bangerth Jul 11, 2018
fe9bcc7
adding temp anomaly pp
maxrudolph Jul 10, 2018
f80a7ee
fix style
maxrudolph Jul 11, 2018
ca425c2
Merge pull request #2567 from bangerth/cleanup
tjhei Jul 11, 2018
967f47e
add test case and respond to Rene's edits
maxrudolph Jul 12, 2018
e74ef62
Add test
anne-glerum Jul 5, 2018
31a88da
Merge pull request #2555 from anne-glerum/point_values_only_at_specif…
anne-glerum Jul 12, 2018
f629909
Fix assertion bug and add comments
maxrudolph Jul 12, 2018
395de08
Merge pull request #2568 from maxrudolph/temperature-anomaly
gassmoeller Jul 12, 2018
92a5563
Merge pull request #2509 from SophieCoulson/combined-grid-smoothing
gassmoeller Jul 17, 2018
06a3376
Add a maximum yield strength value for drucker-prager rheology needed…
mibillen Jul 20, 2018
ea6997c
Update viscoplastic FEValues quadrature
naliboff Jul 22, 2018
a227a4d
Merge pull request #2580 from naliboff/viscoplastic_fevalues_quadrature
jdannberg Jul 23, 2018
1cb578c
Add a test for the maximum yield stress
mibillen Jul 20, 2018
7cbb191
forgot to add prm file to last commit
mibillen Jul 23, 2018
58f97d4
replaced with correct version of visco_plastic.cc and viso_plastic.h,…
mibillen Jul 23, 2018
63e897a
fixed comment format
mibillen Jul 24, 2018
4c8f976
applied patch for test results
mibillen Jul 24, 2018
da5a3ba
Merge pull request #2578 from mibillen/max_yield
gassmoeller Jul 24, 2018
e48028a
do not assemble stokes boundary assemblers on periodic faces
jdannberg Jul 26, 2018
6ef3bf2
Merge pull request #2584 from jdannberg/stokes_assembly_boundary_face
gassmoeller Jul 26, 2018
7783938
Add the world builder as a submodule.
MFraters Jul 16, 2018
77f60f2
Add the world builder to the CMakeLists.txt.
MFraters Jul 16, 2018
8858513
add the world builder to aspect's core files.
MFraters Jul 16, 2018
d9b4220
Fix bug in steinberger compressibility
gassmoeller Jul 29, 2018
513ffde
Add test and changelog entry
gassmoeller Jul 29, 2018
6244c84
Update test results
gassmoeller Jul 30, 2018
50c029e
Merge pull request #2571 from MFraters/world_builder3
gassmoeller Jul 30, 2018
718d186
Merge pull request #2589 from gassmoeller/fix_bug_steinberger_material
gassmoeller Jul 30, 2018
697f901
update section on how to write a test
jdannberg Jul 31, 2018
31730c5
Merge pull request #2590 from jdannberg/update_testing_section
naliboff Aug 1, 2018
a77c5a0
manual: add missing bib entry
tjhei Aug 1, 2018
379245c
Merge pull request #2591 from tjhei/add_bibtex_rudi2017weighted
jdannberg Aug 1, 2018
f416e1c
minor fixes
tjhei Aug 1, 2018
f7fdb3b
update parameters
tjhei Aug 1, 2018
a12056b
Fix index bug in named additional outputs
gassmoeller Aug 2, 2018
048ea6c
Add changelog entry
gassmoeller Aug 6, 2018
33cdb74
Merge pull request #2592 from tjhei/maintenance_aug18
gassmoeller Aug 6, 2018
adde756
Merge pull request #2593 from gassmoeller/fix_named_additional_outputs
jdannberg Aug 7, 2018
8165c51
ASPECT dynamic citation
tjhei Jun 28, 2016
88a7ced
add changelog
tjhei Jul 25, 2018
acaab73
output sha1
tjhei Jul 25, 2018
2bcc4ba
output a comment
tjhei Aug 7, 2018
7754ed3
switch website
tjhei Aug 7, 2018
f194db3
Update manual section about extending
gassmoeller Aug 7, 2018
c3edead
Add examples
gassmoeller Aug 7, 2018
50d52d1
Updated the parameter file to fix invalid reference warning in the ma…
alarshi Jul 29, 2018
755a1b6
Removed description of an old parameter.
alarshi Aug 8, 2018
016765e
Merge pull request #2588 from alarshi/fix-manual-references
tjhei Aug 8, 2018
330566e
Fix update source file script
gassmoeller Aug 8, 2018
e10f98c
Merge pull request #2599 from gassmoeller/fix_update_script_source
tjhei Aug 9, 2018
309efdb
Merge pull request #2595 from gassmoeller/update_extending_section_ma…
tjhei Aug 11, 2018
f44e0fa
address comments
tjhei Aug 13, 2018
727bfd7
Merge pull request #1014 from tjhei/citation
jdannberg Aug 14, 2018
2d2d04d
Remove experimental setting that did not help
gassmoeller Aug 14, 2018
9401009
Merge pull request #2606 from gassmoeller/remove_idle_minutes_jenkins
gassmoeller Aug 14, 2018
8df19bb
Allow negative scale factor for boundary velocity
Aug 14, 2018
41ebdff
fix tests/global_melt_parallel
tjhei Aug 15, 2018
c372e15
Set up XUnit to allow Jenkins to display test results
tjesser-ucdavis-edu Aug 9, 2018
ba29095
Merge pull request #2610 from tjhei/fix_test_global_melt_parallel
gassmoeller Aug 15, 2018
020d70b
Add comments to the most obscure parts of the Jenkinsfile
gassmoeller Aug 16, 2018
5996e3c
Update documentation
gassmoeller Aug 16, 2018
7468488
Clean up some cmake pieces.
bangerth Aug 16, 2018
b8c3e15
Indent an include statement.
bangerth Aug 17, 2018
05847cf
Make a function unconditionally available and conditionally fail.
bangerth Aug 17, 2018
517925e
Merge pull request #2604 from tjesser-ucdavis-edu/master
tjhei Aug 17, 2018
8f7f0dd
Merge pull request #2612 from bangerth/cmake
tjhei Aug 17, 2018
f295e66
Merge pull request #2614 from bangerth/follow-up
gassmoeller Aug 17, 2018
af9c7f8
Merge pull request #2607 from bartniday/negative-scale-factor
gassmoeller Aug 17, 2018
d5c7f4f
Add new plugin for rift composition initial conditions
anne-glerum May 9, 2017
f7bd42c
Add noise with gaussian distribution
anne-glerum May 9, 2017
85d8a10
Improve on polygon rift
anne-glerum May 10, 2017
7ae046d
Add 3rd dimension noise table and depth smoothing
anne-glerum May 11, 2017
6acb20f
Clean up
anne-glerum May 11, 2017
f7320cb
Use depth instead of height for smoothing
anne-glerum May 22, 2017
82c2b93
Change noise to be [0,1)
anne-glerum May 23, 2017
d0b6d22
Add chunk option
anne-glerum May 30, 2017
42c00b5
Clean up
anne-glerum Jun 12, 2017
985ca5c
Add distance to line segment function
anne-glerum Jun 21, 2017
d3c262f
Read in line segments instead of polygons
anne-glerum Jun 21, 2017
b0f70ed
Use line segments in initial composition function
anne-glerum Jun 21, 2017
90a8a5d
Add instantiation, astyle
anne-glerum Jun 21, 2017
393ab42
Add separate rift depth smoothing halfwidth
anne-glerum Mar 23, 2018
1f91f4f
Improve 2d rift input
anne-glerum Mar 25, 2018
a1581ab
Improve spherical geometry functionality
anne-glerum Mar 25, 2018
65c7d52
Improve check for strain compo field present
anne-glerum Mar 25, 2018
dd9f36f
Simplify geometry checks
anne-glerum Mar 25, 2018
d4caa31
Add seed to input file
anne-glerum Mar 25, 2018
9cc01fc
Astyle, clean up and add comments
anne-glerum Mar 25, 2018
1b23d20
Update rift to work with updated distance to line function, and multi…
Aug 23, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
23 changes: 23 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Configuration file to be used with clang-tidy

# This file is automatically discovered by clang-tidy when you run it on a
# file in a subdirectory.

# Usage:
#
# set DEAL_II_DIR to an installation made with clang
# rm -rf build; mkdir build; cd build
# CXX=clang++ CC=clang cmake -DCMAKE_CXX_CLANG_TIDY="clang-tidy;-fix;-quiet;-header-filter=$(realpath ..)" ..
# make -j 4

# enabled checks:
Checks: '-*,modernize-use-emplace,modernize-make-shared,mpi-*'


# other options to be used in the future as soon as we compile cleanly:

# performance-*,-performance-inefficient-string-concatenation
# modernize-avoid-bind
# modernize-make-unique,
# modernize-replace-autoptr,
# modernize-use-nullptr
3 changes: 2 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
.gitattributes export-ignore
.gitignore export-ignore
doc/bump_version.sh export-ignore
doc/filter export-ignore
doc/release-tasklist export-ignore
doc/manual/ export-ignore
doc/release-tasklist export-ignore
doc/update_parameters.sh export-ignore
Jenkinsfile export-ignore
.zenodo.json export-ignore
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
/benchmarks/**/cmake_install.cmake
/benchmarks/**/lib*.so
/benchmarks/**/output/
/benchmarks/**/aspect
/benchmarks/**/temp.prm
/benchmarks/tangurnis/*/*csv
/benchmarks/tangurnis/*/solution*
/build*/
Expand All @@ -42,6 +44,7 @@
/doc/manual/prmindexfull.ilg
/doc/manual/prmindexfull.ind
/doc/manual/cookbooks/**/*.out
/doc/modules/changes.h
/output/
/tests/CMakeFiles/
/tests/CTestTestfile.cmake
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "contrib/WorldBuilder"]
path = contrib/WorldBuilder
url = [email protected]:GeodynamicWorldBuilder/WorldBuilder.git
24 changes: 24 additions & 0 deletions .zenodo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"creators": [
{
"name": "Wolfgang Bangerth",
"affiliation": "Colorado State University",
"orcid": "0000-0003-2311-9402"
},
{
"name": "Juliane Dannberg",
"affiliation": "Colorado State University",
"orcid": "0000-0003-0357-7115"
},
{
"name": "Rene Gassmoeller",
"affiliation": "Colorado State University",
"orcid": "0000-0001-7098-8198"
},
{
"name": "Timo Heister",
"affiliation": "Clemson University",
"orcid": "0000-0002-8137-3903"
}
]
}
12 changes: 12 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@ community. It is currently maintained by the following people:
Rene Gassmoeller
Timo Heister

The following people have significantly contributed and furthered ASPECT's
goals and are therefore Principal Developers:

Jacky Austermann
Wolfgang Bangerth
Juliane Dannberg
Menno Fraters
Rene Gassmoeller
Anne Glerum
Timo Heister
John Naliboff

A complete and growing list of the many authors that have contributed
over the years can be found at
https://github.com/geodynamics/aspect/graphs/contributors
5 changes: 5 additions & 0 deletions CITATION
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Please open

https://aspect.geodynamics.org/citing.html?src=citation

for information on how to cite ASPECT.
Loading