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

Fs subcycle cfl fix #307

Merged
merged 39 commits into from
Feb 23, 2017
Merged
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
05618dd
Re-compute moments
galfthan Aug 23, 2016
4a934ad
Merge remote-tracking branch 'ykempf/fix_test_fp'
ursg Feb 7, 2017
586eb32
Simple cfl check with allreduce at each substep/subcycle fo the field…
ykempf Jun 5, 2015
5425f22
Fixed several errors in the previous version.
ykempf Jun 8, 2015
9ba21f3
Removed testing MPI_Barrier().
ykempf Jun 8, 2015
2dce06f
Fixed warning message to be more informative and correct.
ykempf Feb 8, 2016
a1c015b
Put logfile in use in fieldsolver subcycling reporting.
ykempf Feb 8, 2016
58d4add
Removed dodgy bailout::min_dt threshold in fieldsolver subcycling.
ykempf Feb 8, 2016
58dbef2
Second logfile entry for fieldsolver subcycling.
ykempf Feb 8, 2016
086d903
Switched to a local variable in propagateFields.
ykempf Feb 8, 2016
060b1b7
Fixed the final substep length issue, commented.
ykempf Feb 8, 2016
551f488
Change subcycle dt only if it would exceed cfl.
ykempf Feb 8, 2016
6669eeb
New fs subcylce algorithm, not tested yet
galfthan Feb 9, 2016
dd2b5eb
Two typos fixed from previous commit. Now compiles.
ykempf Feb 9, 2016
0752798
Fixup commit, i was renamed to subcycleCount in ldz_main.
ursg Feb 7, 2017
86c8a81
Interface change to calculateWaveSpeed functions.
ykempf Jul 7, 2016
f0a986e
Split upwinding and CFL velocities in LDZ solver.
ykempf Jul 7, 2016
ed91312
Version with Hall in cfl but not upwinding.
ykempf Aug 24, 2016
a174e64
Blunt Runge Kutta second order substepping.
ykempf Aug 22, 2016
d545f30
Merge remote-tracking branch 'upstream/master' into fix_update_moment…
galfthan Feb 7, 2017
6fe1585
Two new testcases with subcycles for the testpackage.
ursg Feb 14, 2017
3d54bb6
Added map include so that it compiles on sisu
galfthan Feb 14, 2017
5d30d94
Merge pull request #309 from galfthan/fix_sisu_compilation
galfthan Feb 14, 2017
70abfd8
Fix typo ist test_fp_substeps testpackage.
ursg Feb 21, 2017
6dc23c1
Removed commented code, added one explanation comment.
ykempf Feb 21, 2017
9625c7c
Calculate acc- and fieldsolver subcycles even when running with fixed dt
ursg Feb 21, 2017
60ae054
Calculate acc- and fieldsolver subcycles even when running with fixed dt
ursg Feb 21, 2017
a51dab8
Still output dt calculation results, even if it is not being used.
ursg Feb 21, 2017
0919389
Added map include so that it compiles on sisu
galfthan Feb 14, 2017
2e9bc7a
Updated Dispersion.
ykempf Feb 22, 2017
1cbee6f
CFL wave speeds in field solver: scheme and interface change.
ykempf Feb 22, 2017
4f93c95
Added new polar test, and replaced old acc_1.
galfthan Feb 22, 2017
29c701b
Enable new test to run
galfthan Feb 22, 2017
8a6c8bd
Merge pull request #305 from ykempf/field_solver_stepping_improvements
ursg Feb 22, 2017
4ed3ddd
Still output dt calculation results, even if it is not being used.
ursg Feb 21, 2017
7aedaf8
Merge pull request #311 from ursg/testpackage_subcycles
ursg Feb 22, 2017
b608fb7
Merge pull request #308 from galfthan/fix_update_moments_in_acc
ursg Feb 23, 2017
dffbd6c
Merge branch 'fs_subcycle_cfl_fix' with current master.
ursg Feb 23, 2017
989267c
Remove superfluous second calculation of moment derivatives per subcycle
ursg Feb 23, 2017
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
Prev Previous commit
Next Next commit
Two typos fixed from previous commit. Now compiles.
  • Loading branch information
ykempf authored and ursg committed Feb 7, 2017
commit dd2b5ebecbcf22667c3a753272cccd34581aeae4
4 changes: 2 additions & 2 deletions fieldsolver/ldz_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -394,11 +394,11 @@ bool propagateFields(
// short delta step at the end, instead 2 more normal ones
if( subcycleT + 1.5 * subcycleDt > targetT ) {
subcycleDt = targetT - subcycleT;
maxSubCycleCount = subcycleCount + 1; // 1 more steps
maxSubcycleCount = subcycleCount + 1; // 1 more steps
//check that subcyclDt has correct CFL, take 2 if not
if(subcycleDt > dtMaxGlobal * P::fieldSolverMaxCFL ) {
subcycleDt = (targetT - subcycleT)/2;
maxSubCycleCount = subcycleCount + 2;
maxSubcycleCount = subcycleCount + 2;
}
}

Expand Down