Skip to content
Open
Show file tree
Hide file tree
Changes from 94 commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
4906a2d
Add check for gridfile generated by new versions of Hypnotoad
johnomotani Nov 4, 2019
576a8fa
Bugfix: Laplace_FV in full-velocity model
bendudson Mar 3, 2020
6568b76
Bugfix: full-velocity heatflux term had 11 rather than 1
bendudson Mar 3, 2020
9a166c1
Added NeutralMixed::precon for testing
bendudson Apr 8, 2020
2fb2986
Merge pull request #7 from johnomotani/next-atomic-bxcv-new-hypnotoad…
bendudson Apr 9, 2020
7535940
Merge pull request #10 from bendudson/next-atomic
bendudson Apr 9, 2020
ef486d6
mixed neutral precondition NVn
bendudson Apr 9, 2020
10db9b9
Add c_str() to output of gridfile_parallel_transform
bendudson May 27, 2020
39b761e
Merge pull request #13 from bendudson/master-neutral-precon
bendudson Jun 12, 2020
cf72d57
Update check of parallel transform
bendudson Jun 12, 2020
69bd32c
Add option nesheath_floor
bendudson Nov 11, 2020
b611ff9
Merge pull request #15 from bendudson/sheath-nefloor
bendudson Nov 11, 2020
8433ff6
Fix Spi to zero outside core if core_sources=true
hahahasan Nov 11, 2020
f85ad2b
Separating adapt_sources for p and n
hahahasan Nov 11, 2020
dd5b25d
Set phi boundary condition constant in Z
hahahasan Nov 11, 2020
8bfe729
Add sheath boundary with log extrapolation
bendudson Nov 11, 2020
ef49236
Fix potential when sheath_ydown=false
hahahasan Nov 11, 2020
87439e2
Modify radial buffer regions
bendudson Nov 11, 2020
0bd2e84
Add .a files to .gitignore
hahahasan Nov 11, 2020
3dd2f3c
Add missing (polarization) terms in Vorticity equation
bshanahan Nov 11, 2020
600399b
Remove unused code from previous commit.
bshanahan Nov 11, 2020
33a7daa
Fix copy-paste error in outer radial buffer
bendudson Nov 11, 2020
e5d6720
Add default sections which throw in boundary heat flux
bendudson Nov 11, 2020
62f1c73
Fix case 4 yupper Te boundary
bendudson Nov 11, 2020
efa85dd
Merge pull request #18 from bendudson/fix-sheath
bendudson Nov 11, 2020
431c15b
Relaxation boundary for potential
bendudson Nov 11, 2020
567270c
Fix phi boundary relax, update time
bendudson Nov 11, 2020
3437b43
Change how phi boundary is set
bendudson Nov 12, 2020
6d36001
Include Pi in phi boundary conditions
bendudson Nov 12, 2020
36e595a
Fix phi in outer boundary cell
bendudson Nov 12, 2020
1ffc7e9
Fix initial guess given to new XZ solver
bendudson Nov 12, 2020
7b73807
Always save phi to restart files if evolving vorticity
bendudson Nov 12, 2020
e1aa51a
Split the ion viscosity into a simple diffusion and the rest
bendudson Nov 13, 2020
7f39177
Add options for averaging in Y in core buffer region
bendudson Nov 13, 2020
433e97d
Don't calculate nu if currents are turned off
bendudson Nov 13, 2020
a45a893
Add clang-format file
bendudson Nov 13, 2020
068589c
Merge pull request #16 from bendudson/radial-buffers-averagey
bendudson Nov 15, 2020
6dd3ee6
Merge pull request #20 from bendudson/split-ion-viscosity
bendudson Nov 15, 2020
8e5fdcc
Set boundary for LaplaceXZ solver
bendudson Nov 16, 2020
97cfce0
Merge pull request #19 from bendudson/phi-relax-boundary
bendudson Nov 16, 2020
ac95178
Remove WIP hot ion sinks.
bshanahan Nov 17, 2020
0b71269
Merge pull request #21 from bendudson/clang-format
bendudson Nov 17, 2020
ade5d20
Set j_pol_terms to be false by default.
bshanahan Nov 18, 2020
c231b9d
Add j_diamag_scale factor
bendudson Nov 19, 2020
682c62c
Modify terms, to use phi + Pi
bendudson Nov 19, 2020
18e8369
Merge pull request #17 from bendudson/j_pol-terms
bendudson Nov 25, 2020
34c752c
Fix initialisation of relaxing phi boundari conditions
bendudson Nov 25, 2020
a8155d1
Add a 2D example of a radially advecting blob
bendudson Nov 25, 2020
00db1e8
Merge pull request #23 from bendudson/add-blob2d-example
bendudson Nov 25, 2020
2a37315
Merge pull request #22 from bendudson/fix-relax-init
bendudson Nov 25, 2020
320e3c6
Add option sources_positive
bendudson Nov 27, 2020
a21f833
Add option phi_dissipation
bendudson Nov 27, 2020
69276fd
Merge pull request #25 from bendudson/sources-positive
bendudson Nov 27, 2020
99ca0af
Add tokamak example
bendudson Nov 27, 2020
336db4d
Update tokamak/1-no-currents/BOUT.inp
bendudson Nov 27, 2020
95d1ec6
Tidying up tokamak example inputs
bendudson Nov 27, 2020
1a67a95
Remove unused option staggered
bendudson Nov 27, 2020
34349ce
Simplifying no-current input file
bendudson Nov 27, 2020
9062a14
Add input file for case with currents on
bendudson Nov 27, 2020
ffc668f
set j_diamag_scale = 1 if missing
bendudson Nov 27, 2020
b13bb7e
Merge pull request #29 from bendudson/scale-jdiamag
bendudson Nov 28, 2020
2056642
Add python script to modify curvature
bendudson Dec 2, 2020
673bbb4
Merge pull request #26 from bendudson/phi-dissipation
bendudson Dec 3, 2020
641fd65
Merge pull request #28 from bendudson/tokamak-example
bendudson Dec 3, 2020
97eb95b
Update slab3d example
bendudson Dec 10, 2020
8bd3fd7
slab3d tweaks, seems to be running ok
bendudson Dec 10, 2020
3065bfa
Adding annulus linear device example
bendudson Dec 10, 2020
4a6a90d
Adjust initial profiles and input sources
bendudson Dec 11, 2020
138032d
Add input_sources script and README
bendudson Dec 11, 2020
26bf058
Fix header in tokamak README file
bendudson Dec 14, 2020
e18fe29
Update linear device (annulus) example
bendudson Dec 14, 2020
75e65ee
Add hermes-2 link to linear-device
bendudson Dec 14, 2020
bda9d55
Add hyper dissipation in Z
bendudson Dec 14, 2020
6b47e9f
Merge pull request #30 from bendudson/slab3d-update
bendudson Dec 14, 2020
ad0a6d3
Replace tesheath with Te[yend] in Neumann boundary
bendudson Dec 17, 2020
870ce3f
Use nesheath_floor rather than 1e-10
bendudson Dec 17, 2020
7527fca
Replace sound speed with max_speed in Ne, Pe
bendudson Dec 21, 2020
d590a28
Floor Pe to zero in energy transfer terms
bendudson Dec 21, 2020
6ee6600
Add VePsi to boundary damping
bendudson Dec 21, 2020
e4c0a52
Modify ramp_mesh to be false by default
bendudson Jan 4, 2021
84ee66d
Merge pull request #31 from bendudson/sheath-te-neumann
bendudson Jan 4, 2021
9cdf1fb
Merge pull request #33 from bendudson/master-ramp-mesh
bendudson Jan 5, 2021
f3a1815
Merge pull request #32 from bendudson/master-wave-speed
bendudson Jan 5, 2021
af7018f
Add arg0 to adjust_curvature help message
bendudson Jan 28, 2021
95e80dc
Black format adjust_curvature
bendudson Jan 28, 2021
f3cee67
Add tokamak/setprofiles.py
bendudson Jan 28, 2021
86d18a0
Add note on profiles to tokamak README
bendudson Jan 28, 2021
670aec4
Merge pull request #35 from bendudson/master-tokamak-scripts
bendudson Jan 29, 2021
65ec4f8
Add analysis and plotting scripts
bendudson Feb 5, 2021
414d5c8
Merge pull request #36 from bendudson/master-tokamak-scripts
bendudson Feb 5, 2021
0b4dc16
Update to newest next branch
bshanahan Jul 20, 2021
e53561e
Merge branch 'next' into next-update
bshanahan Aug 16, 2021
9c964c0
Update for 3D metrics
bshanahan Aug 23, 2021
e0a49ab
Fix loadmetric, get slab3d to "run"
bshanahan Aug 23, 2021
54da8f9
Add simplified polarization current
bshanahan Aug 30, 2021
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
111 changes: 111 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
---
# Note: commented out lines require clang-format >= 6
Language: Cpp
BasedOnStyle: LLVM
AccessModifierOffset: -2
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
# AlignEscapedNewlines: Right
AlignEscapedNewlinesLeft: true
AlignOperands: true
AlignTrailingComments: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: true
BinPackArguments: true
BinPackParameters: true
BraceWrapping:
AfterClass: false
AfterControlStatement: false
AfterEnum: false
AfterFunction: false
AfterNamespace: false
AfterObjCDeclaration: false
AfterStruct: false
AfterUnion: false
# AfterExternBlock: false
BeforeCatch: false
BeforeElse: false
IndentBraces: false
# SplitEmptyFunction: true
# SplitEmptyRecord: true
# SplitEmptyNamespace: true
BreakBeforeBinaryOperators: NonAssignment
BreakBeforeBraces: Attach
# BreakBeforeInheritanceComma: false
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
# BreakConstructorInitializers: BeforeColon
#BreakAfterJavaFieldAnnotations: false
#BreakStringLiterals: true
ColumnLimit: 90
CommentPragmas: '^ IWYU pragma:'
# CompactNamespaces: false
ConstructorInitializerAllOnOneLineOrOnePerLine: false
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: true
DerivePointerAlignment: false
DisableFormat: false
ExperimentalAutoDetectBinPacking: false
# FixNamespaceComments: true
ForEachMacros:
- foreach
- Q_FOREACH
- BOOST_FOREACH
# IncludeBlocks: Regroup
IncludeCategories:
- Regex: '^(<|")bout/'
Priority: 2
- Regex: '^(<|"(gtest|gmock|isl|json)/)'
Priority: 3
- Regex: '^<.*>'
Priority: 4
- Regex: '.*'
Priority: 1
#IncludeIsMainRegex: '(Test)?$'
IndentCaseLabels: false
# IndentPPDirectives: None
IndentWidth: 2
IndentWrappedFunctionNames: false
KeepEmptyLinesAtTheStartOfBlocks: true
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
# PenaltyBreakAssignment: 2
PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakString: 1000
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60
PointerAlignment: Left
ReflowComments: true
SortIncludes: true
# SortUsingDeclarations: true
SpaceAfterCStyleCast: false
#SpaceAfterTemplateKeyword: true
SpaceBeforeAssignmentOperators: true
SpaceBeforeParens: ControlStatements
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: false
SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Cpp11
TabWidth: 8
UseTab: Never
...
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*.o
*.nc
BOUT.log.*

*.a
Loading