Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
flexpart
flexpart
Commits
478e9e69
Commit
478e9e69
authored
Sep 01, 2015
by
Espen Sollum
Browse files
dates file is now created at program start, instead of appending to it if it already exists
parent
cda0919f
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/concoutput.f90
View file @
478e9e69
...
@@ -96,11 +96,12 @@ subroutine concoutput(itime,outnum,gridtotalunc,wetgridtotalunc, &
...
@@ -96,11 +96,12 @@ subroutine concoutput(itime,outnum,gridtotalunc,wetgridtotalunc, &
real
,
parameter
::
smallnum
=
tiny
(
0.0
)
! smallest number that can be handled
real
,
parameter
::
smallnum
=
tiny
(
0.0
)
! smallest number that can be handled
real
,
parameter
::
weightair
=
28.97
real
,
parameter
::
weightair
=
28.97
logical
::
sp_zer
logical
::
sp_zer
LOGICAL
,
save
::
init
=
.true.
character
::
adate
*
8
,
atime
*
6
character
::
adate
*
8
,
atime
*
6
character
(
len
=
3
)
::
anspec
character
(
len
=
3
)
::
anspec
integer
::
mind
integer
::
mind
! mind eso:added to ensure identical results between 2&3-fields versions
! mind eso:added to ensure identical results between 2&3-fields versions
CHARACTER
(
LEN
=
8
),
save
::
file_stat
=
'REPLACE'
! Determine current calendar date, needed for the file name
! Determine current calendar date, needed for the file name
!**********************************************************
!**********************************************************
...
@@ -109,10 +110,21 @@ subroutine concoutput(itime,outnum,gridtotalunc,wetgridtotalunc, &
...
@@ -109,10 +110,21 @@ subroutine concoutput(itime,outnum,gridtotalunc,wetgridtotalunc, &
call
caldate
(
jul
,
jjjjmmdd
,
ihmmss
)
call
caldate
(
jul
,
jjjjmmdd
,
ihmmss
)
write
(
adate
,
'(i8.8)'
)
jjjjmmdd
write
(
adate
,
'(i8.8)'
)
jjjjmmdd
write
(
atime
,
'(i6.6)'
)
ihmmss
write
(
atime
,
'(i6.6)'
)
ihmmss
open
(
unitdates
,
file
=
path
(
2
)(
1
:
length
(
2
))//
'dates'
,
ACCESS
=
'APPEND'
)
OPEN
(
unitdates
,
file
=
path
(
2
)(
1
:
length
(
2
))//
'dates'
,
ACCESS
=
'APPEND'
,
STATUS
=
file_stat
)
write
(
unitdates
,
'(a)'
)
adate
//
atime
write
(
unitdates
,
'(a)'
)
adate
//
atime
close
(
unitdates
)
close
(
unitdates
)
! Overwrite existing dates file on first call, later append to it
! This fixes a bug where the dates file kept growing across multiple runs
! TODO check if the 'always APPEND'-behaviour is useful in other scenarioes
! e.g. (restart?)
IF
(
init
)
THEN
file_stat
=
'OLD'
init
=
.false.
END
IF
! For forward simulations, output fields have dimension MAXSPEC,
! For forward simulations, output fields have dimension MAXSPEC,
! for backward simulations, output fields have dimension MAXPOINT.
! for backward simulations, output fields have dimension MAXPOINT.
! Thus, make loops either about nspec, or about numpoint
! Thus, make loops either about nspec, or about numpoint
...
...
src/concoutput_mpi.f90
View file @
478e9e69
...
@@ -101,10 +101,12 @@ subroutine concoutput(itime,outnum,gridtotalunc,wetgridtotalunc, &
...
@@ -101,10 +101,12 @@ subroutine concoutput(itime,outnum,gridtotalunc,wetgridtotalunc, &
real
,
parameter
::
smallnum
=
tiny
(
0.0
)
! smallest number that can be handled
real
,
parameter
::
smallnum
=
tiny
(
0.0
)
! smallest number that can be handled
real
,
parameter
::
weightair
=
28.97
real
,
parameter
::
weightair
=
28.97
logical
::
sp_zer
logical
::
sp_zer
LOGICAL
,
save
::
init
=
.true.
character
::
adate
*
8
,
atime
*
6
character
::
adate
*
8
,
atime
*
6
character
(
len
=
3
)
::
anspec
character
(
len
=
3
)
::
anspec
integer
::
mind
integer
::
mind
! mind eso:added to ensure identical results between 2&3-fields versions
! mind eso:added to ensure identical results between 2&3-fields versions
CHARACTER
(
LEN
=
8
),
save
::
file_stat
=
'REPLACE'
! Measure execution time
! Measure execution time
if
(
mp_measure_time
)
call
mpif_mtime
(
'rootonly'
,
0
)
if
(
mp_measure_time
)
call
mpif_mtime
(
'rootonly'
,
0
)
...
@@ -117,10 +119,20 @@ subroutine concoutput(itime,outnum,gridtotalunc,wetgridtotalunc, &
...
@@ -117,10 +119,20 @@ subroutine concoutput(itime,outnum,gridtotalunc,wetgridtotalunc, &
call
caldate
(
jul
,
jjjjmmdd
,
ihmmss
)
call
caldate
(
jul
,
jjjjmmdd
,
ihmmss
)
write
(
adate
,
'(i8.8)'
)
jjjjmmdd
write
(
adate
,
'(i8.8)'
)
jjjjmmdd
write
(
atime
,
'(i6.6)'
)
ihmmss
write
(
atime
,
'(i6.6)'
)
ihmmss
open
(
unitdates
,
file
=
path
(
2
)(
1
:
length
(
2
))//
'dates'
,
ACCESS
=
'APPEND'
)
OPEN
(
unitdates
,
file
=
path
(
2
)(
1
:
length
(
2
))//
'dates'
,
ACCESS
=
'APPEND'
,
STATUS
=
file_stat
)
write
(
unitdates
,
'(a)'
)
adate
//
atime
write
(
unitdates
,
'(a)'
)
adate
//
atime
close
(
unitdates
)
close
(
unitdates
)
! Overwrite existing dates file on first call, later append to it
! This fixes a bug where the dates file kept growing across multiple runs
! TODO check if the 'always APPEND'-behaviour is useful in other scenarioes
! e.g. (restart?)
IF
(
init
)
THEN
file_stat
=
'OLD'
init
=
.false.
END
IF
! For forward simulations, output fields have dimension MAXSPEC,
! For forward simulations, output fields have dimension MAXSPEC,
! for backward simulations, output fields have dimension MAXPOINT.
! for backward simulations, output fields have dimension MAXPOINT.
! Thus, make loops either about nspec, or about numpoint
! Thus, make loops either about nspec, or about numpoint
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment