Skip to content

Commit 96ef73a

Browse files
committed
Change renamed dtmax -> dtmin and skip operations when setting icheck/iout?d/isave to 0.
1 parent 766e895 commit 96ef73a

File tree

41 files changed

+66
-60
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+66
-60
lines changed

docs/INFO_INPUT.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Consider the following input file as example (corresponds to a turbulent plane c
88
ng(1:3) = 512, 256, 144
99
l(1:3) = 6., 3., 1.
1010
gtype = 1, gr = 0.
11-
cfl = 0.95, dtmin = 1.e5, dt_f = -1
11+
cfl = 0.95, dtmax = 1.e5, dt_f = -1
1212
is_solve_ns = T, is_track_interface = T
1313
inivel = 'poi'
1414
is_wallturb = T, is_forced_hit = F
@@ -98,13 +98,13 @@ These lines set the computational grid.
9898
---
9999

100100
```fortran
101-
cfl = 0.95, dtmin = 1.e5, dt_f = -1
101+
cfl = 0.95, dtmax = 1.e5, dt_f = -1
102102
```
103103

104104
This line controls the simulation time step.
105105

106-
The time step is set to be equal to `min(cfl*dtmax,dtmin)`, i.e. the minimum value between `dtmin` and `cfl` times the maximum allowable time step `dtmax` (computed every `ickeck` time steps; see below).
107-
`dtmin` is therefore used when a constant time step, smaller than `cfl*dtmax`, is required. If not, it should be set to a high value so that the time step is dynamically adjusted to `cfl*dtmax`. Alternatively, one can force the simulation to advance with a constant time step of arbitrary value, independent of the `dtmax` evaluation, by changing the value of `dt_f` from `-1` to the desired time step.
106+
The time step is set to be equal to `min(cfl*dtmax,dtmax)`, i.e. the minimum value between `dtmax` and `cfl` times the maximum allowable time step `dtmax` (computed every `ickeck` time steps; see below).
107+
`dtmax` is therefore used when a constant time step, smaller than `cfl*dtmax`, is required. If not, it should be set to a high value so that the time step is dynamically adjusted to `cfl*dtmax`. Alternatively, one can force the simulation to advance with a constant time step of arbitrary value, independent of the `dtmax` evaluation, by changing the value of `dt_f` from `-1` to the desired time step.
108108

109109
---
110110

@@ -197,7 +197,7 @@ These lines set the frequency of time step checking and output:
197197
* every `iout3d` time steps **3d scalar fields** are written to a file
198198
* every `isave` time steps a **checkpoint file** is written (`fld_???????.bin`), and a symbolic link for the restart file, `fld.bin`, will point to this last save so that, by default, the last saved checkpoint file is used to restart the simulation
199199

200-
1d, 2d and 3d outputs can be tweaked modifying files `out?d.h90`, and re-compiling the source. See also `output.f90` for more details.
200+
1d, 2d and 3d outputs can be tweaked modifying files `out?d.h90`, and re-compiling the source. See also `output.f90` for more details. _Set any of these variables to `0` to skip the corresponding operation._
201201

202202
---
203203

examples/_CaNS-example-files/_manuscript_lid_driven_cavity/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 128, 128, 128
33
l(1:3) = 1., 1., 1.
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 1.e5
5+
cfl = 0.95, dtmax = 1.e5
66
visci = 1000.
77
inivel = 'zer'
88
is_wallturb = F

examples/_CaNS-example-files/_manuscript_taylor_green_vortex/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 512, 512, 512
33
l(1:3) = 6.2831853071795, 6.283185307179586, 6.283185307179586
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 1.e5
5+
cfl = 0.95, dtmax = 1.e5
66
visci = 1600.
77
inivel = 'tgv'
88
is_wallturb = F

examples/_CaNS-example-files/_manuscript_turbulent_channel/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 512, 256, 144
33
l(1:3) = 6., 3., 1.
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 1.e5
5+
cfl = 0.95, dtmax = 1.e5
66
visci = 5640.
77
inivel = 'poi'
88
is_wallturb = T

examples/_CaNS-example-files/_manuscript_turbulent_duct/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 512, 128, 128
33
l(1:3) = 10., 1., 1.
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 1.e5
5+
cfl = 0.95, dtmax = 1.e5
66
visci = 4410.
77
inivel = 'poi'
88
is_wallturb = T

examples/_CaNS-example-files/closed_box/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 64, 64, 64
33
l(1:3) = 1., 1., 1.
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 1.e5
5+
cfl = 0.95, dtmax = 1.e5
66
visci = 1000.
77
inivel = 'zer'
88
is_wallturb = F

examples/_CaNS-example-files/couette/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 64, 64, 64
33
l(1:3) = 1., 1.5, 1.
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 1.e5
5+
cfl = 0.95, dtmax = 1.e5
66
visci = 1000.
77
inivel = 'cou'
88
is_wallturb = F

examples/_CaNS-example-files/developing_channel/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 64, 64, 64
33
l(1:3) = 1., 1.5, 1.
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 1.e5
5+
cfl = 0.95, dtmax = 1.e5
66
visci = 1000.
77
inivel = 'zer'
88
is_wallturb = F

examples/_CaNS-example-files/developing_duct/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 64, 64, 64
33
l(1:3) = 1., 1.5, 1.
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 1.e5
5+
cfl = 0.95, dtmax = 1.e5
66
visci = 1000.
77
inivel = 'zer'
88
is_wallturb = F

examples/_CaNS-example-files/half_channel/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 64, 64, 64
33
l(1:3) = 1., 1.5, 1.
44
gtype = 2, gr = 0.
5-
cfl = 0.95, dtmin = 1.e5
5+
cfl = 0.95, dtmax = 1.e5
66
visci = 1000.
77
inivel = 'hcl'
88
is_wallturb = F

examples/_CaNS-example-files/lid_driven_cavity/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 64, 64, 64
33
l(1:3) = 1., 1., 1.
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 1.e5
5+
cfl = 0.95, dtmax = 1.e5
66
visci = 1000.
77
inivel = 'zer'
88
is_wallturb = F

examples/_CaNS-example-files/periodic_channel/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 64, 64, 64
33
l(1:3) = 3., 1.5, 1.
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 1.e5
5+
cfl = 0.95, dtmax = 1.e5
66
visci = 1000.
77
inivel = 'log'
88
is_wallturb = F

examples/_CaNS-example-files/periodic_duct/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 64, 64, 64
33
l(1:3) = 3., 1.5, 1.
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 1.e5
5+
cfl = 0.95, dtmax = 1.e5
66
visci = 1000.
77
inivel = 'log'
88
is_wallturb = F

examples/_CaNS-example-files/taylor_green_vortex_2d/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 32, 32, 4
33
l(1:3) = 6.2831853071795, 6.283185307179586, 0.125
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 0.1
5+
cfl = 0.95, dtmax = 0.1
66
visci = 100.
77
inivel = 'tgw'
88
is_wallturb = F

examples/_CaNS-example-files/temporal_boundary_layer/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 128, 128, 256
33
l(1:3) = 40., 20., 72.
44
gtype = 2, gr = 4.
5-
cfl = 0.95, dtmin = 1.e5
5+
cfl = 0.95, dtmax = 1.e5
66
visci = 500.
77
inivel = 'tbl'
88
is_wallturb = F

examples/_CaNS-example-files/triperiodic/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 64, 64, 64
33
l(1:3) = 1., 1., 1.
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 1.e5
5+
cfl = 0.95, dtmax = 1.e5
66
visci = 1000.
77
inivel = 'zer'
88
is_wallturb = F

examples/_CaNS-example-files/turbulent_channel_constant_pressure_gradient/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 512, 256, 144
33
l(1:3) = 12., 6., 2.
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 1.e5
5+
cfl = 0.95, dtmax = 1.e5
66
visci = 180.
77
inivel = 'pdc'
88
is_wallturb = T

examples/_CaNS-example-files/turbulent_channel_convective_reference_frame/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 512, 256, 144
33
l(1:3) = 6., 3., 1.
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 1.e5
5+
cfl = 0.95, dtmax = 1.e5
66
visci = 5640.
77
inivel = 'iop'
88
is_wallturb = T

examples/_CaNS-example-files/turbulent_half_channel_constant_pressure_gradient/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 512, 256, 72
33
l(1:3) = 12., 6., 1.
44
gtype = 2, gr = 0.
5-
cfl = 0.95, dtmin = 1.e5
5+
cfl = 0.95, dtmax = 1.e5
66
visci = 180.
77
inivel = 'hdc'
88
is_wallturb = T

examples/capillary_wave/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 64, 2, 192
33
l(1:3) = 1., 0.03125, 3.
44
gtype = 1, gr = 0.
5-
cfl = 0.45, dtmin = 1.e9, dt_f = -1.
5+
cfl = 0.45, dtmax = 1.e9, dt_f = -1.
66
is_solve_ns = T, is_track_interface = T
77
inivel = 'zer'
88
is_wallturb = F, is_forced_hit = F

examples/deforming_circle/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 256, 2, 256
33
l(1:3) = 1., 0.0078125, 1.
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 2.5e-4, dt_f = -1.
5+
cfl = 0.95, dtmax = 2.5e-4, dt_f = -1.
66
is_solve_ns = F, is_track_interface = T
77
inivel = 'voy'
88
is_wallturb = F, is_forced_hit = F

examples/differentially_heated_cavity/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 128, 2, 128
33
l(1:3) = 1., 0.03125, 1.
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 1.e9, dt_f = -1.
5+
cfl = 0.95, dtmax = 1.e9, dt_f = -1.
66
is_solve_ns = T, is_track_interface = T
77
inivel = 'zer'
88
is_wallturb = F, is_forced_hit = F

examples/dispersed_poiseuille_flow/input-bubble_laden.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 128, 128, 64
33
l(1:3) = 2., 2., 1.
44
gtype = 1, gr = 0.
5-
cfl = 0.45, dtmin = 1.e9, dt_f = -1.
5+
cfl = 0.45, dtmax = 1.e9, dt_f = -1.
66
is_solve_ns = T, is_track_interface = T
77
inivel = 'cou'
88
is_wallturb = F, is_forced_hit = F

examples/dispersed_poiseuille_flow/input-droplet_laden.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 128, 128, 64
33
l(1:3) = 2., 2., 1.
44
gtype = 1, gr = 0.
5-
cfl = 0.45, dtmin = 1.e9, dt_f = -1.
5+
cfl = 0.45, dtmax = 1.e9, dt_f = -1.
66
is_solve_ns = T, is_track_interface = T
77
inivel = 'cou'
88
is_wallturb = F, is_forced_hit = F

examples/droplet_in_couette_flow/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 128, 128, 64
33
l(1:3) = 2., 2., 1.
44
gtype = 1, gr = 0.
5-
cfl = 0.45, dtmin = 1.e9, dt_f = -1.
5+
cfl = 0.45, dtmax = 1.e9, dt_f = -1.
66
is_solve_ns = T, is_track_interface = T
77
inivel = 'cou'
88
is_wallturb = F, is_forced_hit = F

examples/forced_hit/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 256, 256, 256
33
l(1:3) = 6.283185307179586, 6.283185307179586, 6.283185307179586
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 1.e9, dt_f = -1.
5+
cfl = 0.95, dtmax = 1.e9, dt_f = -1.
66
is_solve_ns = T, is_track_interface = T
77
inivel = 'zer'
88
is_wallturb = F, is_forced_hit = T

examples/lid_driven_cavity/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 2, 64, 64
33
l(1:3) = 0.03125, 1., 1.
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 1.e9, dt_f = -1.
5+
cfl = 0.95, dtmax = 1.e9, dt_f = -1.
66
is_solve_ns = T, is_track_interface = T
77
inivel = 'zer'
88
is_wallturb = F, is_forced_hit = F

examples/rising_bubble_2d/input-case-01.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 64, 2, 128
33
l(1:3) = 1., 0.03125, 2.
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 1.e9, dt_f = -1.
5+
cfl = 0.95, dtmax = 1.e9, dt_f = -1.
66
is_solve_ns = T, is_track_interface = T
77
inivel = 'zer'
88
is_wallturb = F, is_forced_hit = F

examples/rising_bubble_2d/input-case-02.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 64, 2, 128
33
l(1:3) = 1., 0.03125, 2.
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 1.e9, dt_f = -1.
5+
cfl = 0.95, dtmax = 1.e9, dt_f = -1.
66
is_solve_ns = T, is_track_interface = T
77
inivel = 'zer'
88
is_wallturb = F, is_forced_hit = F

examples/rising_bubble_3d/input-case-01.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 128, 128, 256
33
l(1:3) = 1., 1, 2.
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 1.e9, dt_f = -1.
5+
cfl = 0.95, dtmax = 1.e9, dt_f = -1.
66
is_solve_ns = T, is_track_interface = T
77
inivel = 'zer'
88
is_wallturb = F, is_forced_hit = F

examples/rising_bubble_3d/input-case-02.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 128, 128, 256
33
l(1:3) = 1., 1, 2.
44
gtype = 1, gr = 0.
5-
cfl = 0.45, dtmin = 1.e9, dt_f = -1.
5+
cfl = 0.45, dtmax = 1.e9, dt_f = -1.
66
is_solve_ns = T, is_track_interface = T
77
inivel = 'zer'
88
is_wallturb = F, is_forced_hit = F

examples/spurious_currents/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 64, 2, 64
33
l(1:3) = 1., 0.03125, 1.
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 5.e-4, dt_f = -1.
5+
cfl = 0.95, dtmax = 5.e-4, dt_f = -1.
66
is_solve_ns = T, is_track_interface = T
77
inivel = 'zer'
88
is_wallturb = F, is_forced_hit = F

examples/translating_circle/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 256, 2, 256
33
l(1:3) = 1., 0.0078125, 1.
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 1e-4, dt_f = -1.
5+
cfl = 0.95, dtmax = 1e-4, dt_f = -1.
66
is_solve_ns = F, is_track_interface = T
77
inivel = 'uni'
88
is_wallturb = F, is_forced_hit = F

examples/zalesak_disk/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 256, 2, 256
33
l(1:3) = 1., 0.0078125, 1.
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 2.5e-5, dt_f = -1.
5+
cfl = 0.95, dtmax = 2.5e-5, dt_f = -1.
66
is_solve_ns = F, is_track_intefrace = T
77
inivel = 'roy'
88
is_wallturb = F, is_forced_hit = F

src/input.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ng(1:3) = 64, 64, 64
33
l(1:3) = 1., 1., 1.
44
gtype = 1, gr = 0.
5-
cfl = 0.95, dtmin = 1.e-4, dt_f = -1.
5+
cfl = 0.95, dtmax = 1.e-4, dt_f = -1.
66
is_solve_ns = T, is_track_interface = T
77
inivel = 'zer'
88
is_wallturb = F, is_forced_hit = F

0 commit comments

Comments
 (0)