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
daedb91d
Commit
daedb91d
authored
13 years ago
by
Dave Whipp
Browse files
Options
Downloads
Patches
Plain Diff
Added a second kink option for surface geometry 13
parent
8cbb4d96
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/module_definitions.f90
+1
-1
1 addition, 1 deletion
src/module_definitions.f90
src/read_input_file.f90
+10
-0
10 additions, 0 deletions
src/read_input_file.f90
with
11 additions
and
1 deletion
src/module_definitions.f90
+
1
−
1
View file @
daedb91d
...
@@ -28,7 +28,7 @@ module definitions
...
@@ -28,7 +28,7 @@ module definitions
double precision
,
dimension
(:),
pointer
::
r
,
s
,
x
,
y
,
z
,
xn
,
yn
,
zn
,
u
,
v
,
w
double precision
,
dimension
(:),
pointer
::
r
,
s
,
x
,
y
,
z
,
xn
,
yn
,
zn
,
u
,
v
,
w
integer
levelt
,
itype
,
material
,
surface_type
,
closed
integer
levelt
,
itype
,
material
,
surface_type
,
closed
double precision
::
sp01
,
sp02
,
sp03
,
sp04
,
sp05
,
sp06
,
sp07
,
sp08
,
sp09
,
sp10
,
sp11
double precision
::
sp01
,
sp02
,
sp03
,
sp04
,
sp05
,
sp06
,
sp07
,
sp08
,
sp09
,
sp10
,
sp11
double precision
::
sp12
,
activation_time
double precision
::
sp12
,
sp13
,
sp14
,
activation_time
integer
,
dimension
(:,:),
pointer
::
icon
integer
,
dimension
(:,:),
pointer
::
icon
logical
rand
logical
rand
integer
leveloct
integer
leveloct
...
...
This diff is collapsed.
Click to expand it.
src/read_input_file.f90
+
10
−
0
View file @
daedb91d
...
@@ -423,6 +423,10 @@ do i=1,params%ns
...
@@ -423,6 +423,10 @@ do i=1,params%ns
if
(
iproc
==
0
)
call
scanfile
(
params
%
infile
,
'surface_param_11_'
//
cm
(
il
:
3
),
surface
(
i
)
%
sp11
,
ires
)
if
(
iproc
==
0
)
call
scanfile
(
params
%
infile
,
'surface_param_11_'
//
cm
(
il
:
3
),
surface
(
i
)
%
sp11
,
ires
)
surface
(
i
)
%
sp12
=
45.d0
surface
(
i
)
%
sp12
=
45.d0
if
(
iproc
==
0
)
call
scanfile
(
params
%
infile
,
'surface_param_12_'
//
cm
(
il
:
3
),
surface
(
i
)
%
sp12
,
ires
)
if
(
iproc
==
0
)
call
scanfile
(
params
%
infile
,
'surface_param_12_'
//
cm
(
il
:
3
),
surface
(
i
)
%
sp12
,
ires
)
surface
(
i
)
%
sp13
=
surface
(
i
)
%
sp01
if
(
iproc
==
0
)
call
scanfile
(
params
%
infile
,
'surface_param_13_'
//
cm
(
il
:
3
),
surface
(
i
)
%
sp13
,
ires
)
surface
(
i
)
%
sp14
=
45.d0
if
(
iproc
==
0
)
call
scanfile
(
params
%
infile
,
'surface_param_14_'
//
cm
(
il
:
3
),
surface
(
i
)
%
sp14
,
ires
)
call
mpi_bcast
(
surface
(
i
)
%
sp01
,
1
,
mpi_double_precision
,
0
,
mpi_comm_world
,
ierr
)
call
mpi_bcast
(
surface
(
i
)
%
sp01
,
1
,
mpi_double_precision
,
0
,
mpi_comm_world
,
ierr
)
call
mpi_bcast
(
surface
(
i
)
%
sp02
,
1
,
mpi_double_precision
,
0
,
mpi_comm_world
,
ierr
)
call
mpi_bcast
(
surface
(
i
)
%
sp02
,
1
,
mpi_double_precision
,
0
,
mpi_comm_world
,
ierr
)
...
@@ -436,6 +440,8 @@ do i=1,params%ns
...
@@ -436,6 +440,8 @@ do i=1,params%ns
call
mpi_bcast
(
surface
(
i
)
%
sp10
,
1
,
mpi_double_precision
,
0
,
mpi_comm_world
,
ierr
)
call
mpi_bcast
(
surface
(
i
)
%
sp10
,
1
,
mpi_double_precision
,
0
,
mpi_comm_world
,
ierr
)
call
mpi_bcast
(
surface
(
i
)
%
sp11
,
1
,
mpi_double_precision
,
0
,
mpi_comm_world
,
ierr
)
call
mpi_bcast
(
surface
(
i
)
%
sp11
,
1
,
mpi_double_precision
,
0
,
mpi_comm_world
,
ierr
)
call
mpi_bcast
(
surface
(
i
)
%
sp12
,
1
,
mpi_double_precision
,
0
,
mpi_comm_world
,
ierr
)
call
mpi_bcast
(
surface
(
i
)
%
sp12
,
1
,
mpi_double_precision
,
0
,
mpi_comm_world
,
ierr
)
call
mpi_bcast
(
surface
(
i
)
%
sp13
,
1
,
mpi_double_precision
,
0
,
mpi_comm_world
,
ierr
)
call
mpi_bcast
(
surface
(
i
)
%
sp14
,
1
,
mpi_double_precision
,
0
,
mpi_comm_world
,
ierr
)
surface
(
i
)
%
activation_time
=
-1.d0
surface
(
i
)
%
activation_time
=
-1.d0
if
(
iproc
==
0
)
call
scanfile
(
params
%
infile
,
'activation_time_'
//
cm
(
il
:
3
),
surface
(
i
)
%
activation_time
,
ires
)
if
(
iproc
==
0
)
call
scanfile
(
params
%
infile
,
'activation_time_'
//
cm
(
il
:
3
),
surface
(
i
)
%
activation_time
,
ires
)
...
@@ -1308,6 +1314,8 @@ if (params%debug.gt.0 .and. iproc.eq.0) then
...
@@ -1308,6 +1314,8 @@ if (params%debug.gt.0 .and. iproc.eq.0) then
write
(
*
,
'(a,i4,a,e11.4)'
)
shift
//
'surface '
,
i
,
' sp10 '
,
surface
(
i
)
%
sp10
write
(
*
,
'(a,i4,a,e11.4)'
)
shift
//
'surface '
,
i
,
' sp10 '
,
surface
(
i
)
%
sp10
write
(
*
,
'(a,i4,a,e11.4)'
)
shift
//
'surface '
,
i
,
' sp11 '
,
surface
(
i
)
%
sp11
write
(
*
,
'(a,i4,a,e11.4)'
)
shift
//
'surface '
,
i
,
' sp11 '
,
surface
(
i
)
%
sp11
write
(
*
,
'(a,i4,a,e11.4)'
)
shift
//
'surface '
,
i
,
' sp12 '
,
surface
(
i
)
%
sp12
write
(
*
,
'(a,i4,a,e11.4)'
)
shift
//
'surface '
,
i
,
' sp12 '
,
surface
(
i
)
%
sp12
write
(
*
,
'(a,i4,a,e11.4)'
)
shift
//
'surface '
,
i
,
' sp13 '
,
surface
(
i
)
%
sp13
write
(
*
,
'(a,i4,a,e11.4)'
)
shift
//
'surface '
,
i
,
' sp14 '
,
surface
(
i
)
%
sp14
write
(
*
,
'(a,i4,a,i4)'
)
shift
//
'surface '
,
i
,
' material '
,
surface
(
i
)
%
material
write
(
*
,
'(a,i4,a,i4)'
)
shift
//
'surface '
,
i
,
' material '
,
surface
(
i
)
%
material
write
(
*
,
'(a,i4,a,e11.4)'
)
shift
//
'surface '
,
i
,
' activation_time '
,
surface
(
i
)
%
activation_time
write
(
*
,
'(a,i4,a,e11.4)'
)
shift
//
'surface '
,
i
,
' activation_time '
,
surface
(
i
)
%
activation_time
write
(
*
,
'(a,i4,a,i4)'
)
shift
//
'surface '
,
i
,
' leveloct '
,
surface
(
i
)
%
leveloct
write
(
*
,
'(a,i4,a,i4)'
)
shift
//
'surface '
,
i
,
' leveloct '
,
surface
(
i
)
%
leveloct
...
@@ -1570,6 +1578,8 @@ if (params%debug.gt.1) then
...
@@ -1570,6 +1578,8 @@ if (params%debug.gt.1) then
write
(
threadinfo
%
Logunit
,
'(a32,i4,a,e11.4)'
)
'surface '
,
i
,
' sp10 '
,
surface
(
i
)
%
sp10
write
(
threadinfo
%
Logunit
,
'(a32,i4,a,e11.4)'
)
'surface '
,
i
,
' sp10 '
,
surface
(
i
)
%
sp10
write
(
threadinfo
%
Logunit
,
'(a32,i4,a,e11.4)'
)
'surface '
,
i
,
' sp11 '
,
surface
(
i
)
%
sp11
write
(
threadinfo
%
Logunit
,
'(a32,i4,a,e11.4)'
)
'surface '
,
i
,
' sp11 '
,
surface
(
i
)
%
sp11
write
(
threadinfo
%
Logunit
,
'(a32,i4,a,e11.4)'
)
'surface '
,
i
,
' sp12 '
,
surface
(
i
)
%
sp12
write
(
threadinfo
%
Logunit
,
'(a32,i4,a,e11.4)'
)
'surface '
,
i
,
' sp12 '
,
surface
(
i
)
%
sp12
write
(
threadinfo
%
Logunit
,
'(a32,i4,a,e11.4)'
)
'surface '
,
i
,
' sp13 '
,
surface
(
i
)
%
sp13
write
(
threadinfo
%
Logunit
,
'(a32,i4,a,e11.4)'
)
'surface '
,
i
,
' sp14 '
,
surface
(
i
)
%
sp14
write
(
threadinfo
%
Logunit
,
'(a32,i4,a,i4)'
)
'surface '
,
i
,
' material '
,
surface
(
i
)
%
material
write
(
threadinfo
%
Logunit
,
'(a32,i4,a,i4)'
)
'surface '
,
i
,
' material '
,
surface
(
i
)
%
material
write
(
threadinfo
%
Logunit
,
'(a32,i4,a,e11.4)'
)
'surface '
,
i
,
' activation_time '
,
surface
(
i
)
%
activation_time
write
(
threadinfo
%
Logunit
,
'(a32,i4,a,e11.4)'
)
'surface '
,
i
,
' activation_time '
,
surface
(
i
)
%
activation_time
write
(
threadinfo
%
Logunit
,
'(a32,i4,a,i4)'
)
'surface '
,
i
,
' leveloct '
,
surface
(
i
)
%
leveloct
write
(
threadinfo
%
Logunit
,
'(a32,i4,a,i4)'
)
'surface '
,
i
,
' leveloct '
,
surface
(
i
)
%
leveloct
...
...
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