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
1a04fab1
Commit
1a04fab1
authored
Apr 28, 2016
by
Espen Sollum
Browse files
Merge branch 'wetdep' into dev
parents
b012d4d6
62e65c73
Changes
7
Hide whitespace changes
Inline
Side-by-side
src/com_mod.f90
View file @
1a04fab1
...
...
@@ -372,7 +372,7 @@ module com_mod
!ZHG Sep 2015
! real :: icloud_stats(0:nxmax-1,0:nymax-1,5,numwfmem)
real
::
ctwc
(
0
:
nxmax
-1
,
0
:
nymax
-1
,
numwfmem
)
!
eso
: =icloud_stats(:,:,4,:)
real
::
ctwc
(
0
:
nxmax
-1
,
0
:
nymax
-1
,
numwfmem
)
!
ESO
: =icloud_stats(:,:,4,:)
! uu,vv,ww [m/2] wind components in x,y and z direction
...
...
src/ecmwf_mod.f90
View file @
1a04fab1
...
...
@@ -50,8 +50,7 @@ module wind_mod
! Maximum dimensions of the nested input grids
!*********************************************
integer
,
parameter
::
maxnests
=
1
,
nxmaxn
=
361
,
nymaxn
=
181
! integer,parameter :: maxnests=1,nxmaxn=86,nymaxn=31
integer
,
parameter
::
maxnests
=
0
,
nxmaxn
=
361
,
nymaxn
=
181
! nxmax,nymax maximum dimension of wind fields in x and y
! direction, respectively
...
...
src/gfs_mod.f90
View file @
1a04fab1
...
...
@@ -48,7 +48,7 @@ module wind_mod
! Maximum dimensions of the nested input grids
!*********************************************
integer
,
parameter
::
maxnests
=
1
,
nxmaxn
=
361
,
nymaxn
=
181
integer
,
parameter
::
maxnests
=
0
,
nxmaxn
=
361
,
nymaxn
=
181
! nxmax,nymax maximum dimension of wind fields in x and y
! direction, respectively
...
...
src/mpi_mod.f90
View file @
1a04fab1
...
...
@@ -102,7 +102,7 @@ module mpi_mod
logical
::
lmpreader
=
.false.
! is set to true for reading process(es) only.
logical
::
lmp_use_reader
=
.false.
! true if separate readwind process is used
! true if only using synchronous MPI send/recv
:
!
.
true
.
if only using synchronous MPI send/recv
(default)
! If setting this to .false., numwfmem must be set to 3
!===============================================================================
logical
::
lmp_sync
=
.true.
...
...
@@ -207,18 +207,21 @@ contains
! Check for sensible combination of parameters
!*********************************************
if
(
.not.
lmp_sync
.and.
numwfmem
.ne.
3.
and
.
lroot
)
then
write
(
*
,
FMT
=
'(80("#"))'
)
write
(
*
,
*
)
'#### mpi_mod::mpif_init> ERROR: '
,
&
&
'numwfmem must be set to 3 for asyncronous reading ####'
write
(
*
,
FMT
=
'(80("#"))'
)
if
(
.not.
lmp_sync
.and.
numwfmem
.ne.
3
)
then
if
(
lroot
)
then
write
(
*
,
FMT
=
'(80("#"))'
)
write
(
*
,
*
)
'#### mpi_mod::mpif_init> ERROR: '
,
&
&
'numwfmem must be set to 3 for asyncronous reading ####'
write
(
*
,
FMT
=
'(80("#"))'
)
end
if
call
MPI_FINALIZE
(
mp_ierr
)
stop
else
if
(
lmp_sync
.and.
numwfmem
.ne.
2.
and
.
lroot
)
then
write
(
*
,
FMT
=
'(80("#"))'
)
write
(
*
,
*
)
'#### mpi_mod::mpif_init> WARNING: '
,
&
&
'numwfmem should be set to 2 for syncronous'
write
(
*
,
*
)
' reading. Results will still be valid, but unneccesary
'
write
(
*
,
*
)
'amount of memory is being
allocated.'
write
(
*
,
*
)
' reading. Results will still be valid, but unneccesary
memory &
&is
allocated.'
write
(
*
,
FMT
=
'(80("#"))'
)
! Force "syncronized" version if all processes will call getfields
else
if
((
.not.
lmp_sync
.and.
mp_np
.lt.
read_grp_min
)
.or.
(
mp_np
.eq.
1
))
then
...
...
src/par_mod.f90
View file @
1a04fab1
...
...
@@ -88,7 +88,7 @@ module par_mod
real
,
parameter
::
d_trop
=
50.
,
d_strat
=
0.1
real
,
parameter
::
rho_water
=
1000.
!ZHG 2015 [kg/m3]
!ZHG MAR2016
real
,
parameter
::
incloud_ratio
=
2
.2
real
,
parameter
::
incloud_ratio
=
6
.2
! karman Karman's constant
! href [m] Reference height for dry deposition
...
...
@@ -185,8 +185,8 @@ module par_mod
! Maximum number of particles, species, and similar
!**************************************************
integer
,
parameter
::
maxpart
=
1
000000
integer
,
parameter
::
maxspec
=
1
integer
,
parameter
::
maxpart
=
20
000000
integer
,
parameter
::
maxspec
=
6
real
,
parameter
::
minmass
=
0.0001
! maxpart Maximum number of particles
...
...
src/readpaths.f90
View file @
1a04fab1
...
...
@@ -81,8 +81,10 @@ subroutine readpaths !(pathfile)
!***************************************************
do
i
=
1
,
maxnests
read
(
unitpath
,
'(a)'
)
path
(
numpath
+2
*
(
i
-1
)
+1
)
read
(
unitpath
,
'(a)'
)
path
(
numpath
+2
*
(
i
-1
)
+2
)
! ESO 2016 Added 'end'/'err' in case user forgot '====' at end of file and
! maxnests > numbnests
read
(
unitpath
,
'(a)'
,
end
=
30
,
err
=
30
)
path
(
numpath
+2
*
(
i
-1
)
+1
)
read
(
unitpath
,
'(a)'
,
end
=
30
,
err
=
30
)
path
(
numpath
+2
*
(
i
-1
)
+2
)
if
(
path
(
numpath
+2
*
(
i
-1
)
+1
)(
1
:
5
)
.eq.
'====='
)
goto
30
length
(
numpath
+2
*
(
i
-1
)
+1
)
=
index
(
path
(
numpath
+2
*
(
i
-1
)
+1
),
' '
)
-1
length
(
numpath
+2
*
(
i
-1
)
+2
)
=
index
(
path
(
numpath
+2
*
(
i
-1
)
+2
),
' '
)
-1
...
...
src/readspecies.f90
View file @
1a04fab1
...
...
@@ -222,6 +222,13 @@ subroutine readspecies(id_spec,pos_spec)
! Check scavenging parameters given in SPECIES file
if
(
lroot
)
then
! ZHG 2016.04.07 Start of changes
write
(
*
,
*
)
' '
if
(
dquer
(
pos_spec
)
.gt.
0
)
write
(
*
,
'(a,i3,a,a,a)'
)
' SPECIES: '
,
&
&
id_spec
,
' '
,
species
(
pos_spec
),
' (AEROSOL) '
if
(
dquer
(
pos_spec
)
.le.
0
)
write
(
*
,
'(a,i3,a,a,a)'
)
' SPECIES: '
,
&
&
id_spec
,
' '
,
species
(
pos_spec
),
' (GAS) '
! Particles
!**********
if
(
dquer
(
pos_spec
)
.gt.
0
)
then
...
...
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