Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
DOUAR WSMP
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
HUGG
DOUAR WSMP
Commits
75f88b56
Commit
75f88b56
authored
13 years ago
by
Dave Whipp
Browse files
Options
Downloads
Patches
Plain Diff
Added spinup phase variables
parent
4ca1789e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/DOUAR.f90
+25
-4
25 additions, 4 deletions
src/DOUAR.f90
with
25 additions
and
4 deletions
src/DOUAR.f90
+
25
−
4
View file @
75f88b56
...
@@ -246,7 +246,7 @@ call compute_plastic_params (params,mat)
...
@@ -246,7 +246,7 @@ call compute_plastic_params (params,mat)
call
show_time
(
total
,
step
,
inc
,
1
,
'define velocity octree$'
)
call
show_time
(
total
,
step
,
inc
,
1
,
'define velocity octree$'
)
call
define_ov
(
ov
,
params
,
threadinfo
)
call
define_ov
(
ov
,
params
,
threadinfo
)
istep
=
1
+
params
%
irestart
istep
=
1
+
params
%
irestart
!------------------------------------------------------------------------------|
!------------------------------------------------------------------------------|
!------------------------------------------------------------------------------|
!------------------------------------------------------------------------------|
...
@@ -254,7 +254,7 @@ istep=1+params%irestart
...
@@ -254,7 +254,7 @@ istep=1+params%irestart
!------------------------------------------------------------------------------|
!------------------------------------------------------------------------------|
!------------------------------------------------------------------------------|
!------------------------------------------------------------------------------|
usecourant
=
(
params
%
dt
.lt.
0.d0
)
!
usecourant = (params%dt .lt. 0.d0)
!------------------------------------------------------------------------------|
!------------------------------------------------------------------------------|
!------------------------------------------------------------------------------|
!------------------------------------------------------------------------------|
...
@@ -263,7 +263,29 @@ usecourant = (params%dt .lt. 0.d0)
...
@@ -263,7 +263,29 @@ usecourant = (params%dt .lt. 0.d0)
!------------------------------------------------------------------------------|
!------------------------------------------------------------------------------|
increase_current_level
=
.false.
increase_current_level
=
.false.
do
while
(
istep
.le.
params
%
nstep
)
do
while
(
istep
.le.
params
%
nstep
)
!---------------------------------------------------------------------------|
!---------------------------------------------------------------------------|
! Are we in the main calculation phase or the spinup phase?
!---------------------------------------------------------------------------|
!---------------------------------------------------------------------------|
if
(
istep
.le.
params
%
nstep_spinup
)
then
params
%
dt
=
params
%
dt_spinup
params
%
griditer
=
params
%
griditer_spinup
params
%
nonlinear_iterations
=
params
%
nonlinear_iterations_spinup
else
params
%
dt
=
params
%
dt_main
params
%
griditer
=
params
%
griditer_main
params
%
nonlinear_iterations
=
params
%
nonlinear_iterations_main
endif
!---------------------------------------------------------------------------|
!---------------------------------------------------------------------------|
! is the CFL condition used for the timestep ?
!---------------------------------------------------------------------------|
!---------------------------------------------------------------------------|
usecourant
=
(
params
%
dt
.lt.
0.d0
)
call
write_streepjes
(
6
,
2
)
call
write_streepjes
(
6
,
2
)
call
write_streepjes
(
8
,
2
)
call
write_streepjes
(
8
,
2
)
call
show_time
(
total
,
step
,
inc
,
-
istep
,
'Start of Step $'
)
call
show_time
(
total
,
step
,
inc
,
-
istep
,
'Start of Step $'
)
...
@@ -967,7 +989,6 @@ do while (istep.le.params%nstep)
...
@@ -967,7 +989,6 @@ do while (istep.le.params%nstep)
! finds courant condition time step in case this is the first iteration
! finds courant condition time step in case this is the first iteration
!--------------------------------------------------------------------------------------
!--------------------------------------------------------------------------------------
!--------------------------------------------------------------------------------------
!--------------------------------------------------------------------------------------
if
(
iter
.eq.
1
)
then
if
(
iter
.eq.
1
)
then
umax
=
0.d0
umax
=
0.d0
do
i
=
1
,
ov
%
nnode
do
i
=
1
,
ov
%
nnode
...
...
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