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
a933590d
Commit
a933590d
authored
Sep 19, 2018
by
Sabine
Browse files
use precip fields for 4 hours, harmonize domainfilling inititalization
parent
3015fe3d
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/calculate_watercycle.f90
View file @
a933590d
...
...
@@ -47,7 +47,7 @@ subroutine calculate_watercycle(partnumber,itime)
integer
ixr
,
jyr
,
idumx
,
idumy
,
istep
,
watersynctime
watersynctime
=
3600
*
6
! was loutstep before, but for monthly run not possible
watersynctime
=
3600
*
3
! was loutstep before, but for monthly run not possible
! watersynctime=loutstep
! Some variables needed for temporal interpolation
...
...
@@ -227,7 +227,7 @@ subroutine calculate_watercycle(partnumber,itime)
! e_minus_pi=precip_reference(ix+1,jy-90+2)*(-24.)
! First timestep and criteria fullfilled, keep it or throw it?
if
(
((
diff
.ge.
0
)
.or.
((
e_minus_pi
/
24
)
.gt.
-1.0
))
.and.
(
status_q
(
i
)
.eq.
1
)
)
then
if
(
((
diff
.ge.
0
)
.or.
((
e_minus_pi
/
24
)
.gt.
-1.0
))
.and.
(
status_q
(
i
)
.eq.
1
)
)
then
! if ( ((diff.ge.0).or.((e_minus_pi/24).gt.-2.0)) .and. (status_q(i).eq.1) ) then
! if ( ((diff.ge.0)) .and. (status_q(i).eq.1) ) then
! if (status_q(i).eq.-100) then ! never! all trajectories.
...
...
src/init_domainfill.f90
View file @
a933590d
...
...
@@ -276,10 +276,11 @@ subroutine init_domainfill(itime)
idt
(
numpart
+
jj
)
=
mintime
if
(
WATERCYCLE
)
then
itra1
(
numpart
+
jj
)
=
itime
itramem
(
numpart
+
jj
)
=
itime
!sec, changed from 0 to itime for watercycle, is 0 when called in standard FP
else
itra1
(
numpart
+
jj
)
=
0
itramem
(
numpart
+
jj
)
=
0
endif
itramem
(
numpart
+
jj
)
=
itime
!sec, changed from 0 to itime for watercycle, is 0 when called in standard FP
itrasplit
(
numpart
+
jj
)
=
itra1
(
numpart
+
jj
)
+
ldirect
*
&
itsplit
xmass1
(
numpart
+
jj
,
1
)
=
colmass
(
ix
,
jy
)/
real
(
ncolumn
)
...
...
src/makefile
View file @
a933590d
...
...
@@ -91,10 +91,10 @@ O_LEV_DBG = g # [0,g]
LIBS
=
-lgrib_api_f90
-lgrib_api
-lm
-ljasper
-lnetcdff
# -fopenmp
#FFLAGS = -I$(INCPATH1) -I$(INCPATH2) -O$(O_LEV) -g -cpp -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -fmessage-length=0 -flto=jobserver -O$(O_LEV) $(FUSER) # -Warray-bounds -fcheck=all # -march=native
FFLAGS
=
-I
$(INCPATH1)
-I
$(INCPATH2)
-O
$(O_LEV)
-g
-cpp
-m64
-mcmodel
=
medium
-fconvert
=
little-endian
-frecord-marker
=
4
-fmessage-length
=
0
-flto
=
jobserver
-O
$(O_LEV)
$(FUSER)
-Warray-bounds
-fcheck
=
all
# -march=native
FFLAGS
=
-I
$(INCPATH1)
-I
$(INCPATH2)
-O
$(O_LEV)
-g
-cpp
-m64
-mcmodel
=
medium
-fconvert
=
little-endian
-frecord-marker
=
4
-fmessage-length
=
0
-flto
=
jobserver
-O
$(O_LEV)
$(FUSER)
#DBGFLAGS = -I$(INCPATH1) -I$(INCPATH2) -O$(O_LEV_DBG) -g3 -ggdb3 -cpp -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -fmessage-length=0 -flto=jobserver -O$(O_LEV_DBG) -fbacktrace -Wall -fdump-core $(FUSER) # -ffpe-trap=invalid,overflow,denormal,underflow,zero -Warray-bounds -fcheck=all
DBGFLAGS
=
-I
$(INCPATH1)
-I
$(INCPATH2)
-O
$(O_LEV
_DBG
)
-g3
-ggdb3
-cpp
-m64
-mcmodel
=
medium
-fconvert
=
little-endian
-frecord-marker
=
4
-fmessage-length
=
0
-flto
=
jobserver
-O
$(O_LEV_DBG)
-fbacktrace
-Wall
-fdump-core
$(FUSER)
-Warray-bounds
-fcheck
=
all
DBGFLAGS
=
-I
$(INCPATH1)
-I
$(INCPATH2)
-O
$(O_LEV)
-g3
-ggdb3
-cpp
-m64
-mcmodel
=
medium
-fconvert
=
little-endian
-frecord-marker
=
4
-fmessage-length
=
0
-flto
=
jobserver
-O
$(O_LEV_DBG)
-fbacktrace
-Wall
-fdump-core
$(FUSER)
LDFLAGS
=
$(FFLAGS)
-L
$(LIBPATH1)
-Wl
,-rpath,
$(LIBPATH1)
$(LIBS)
#-L
$(LIBPATH2)
LDDEBUG
=
$(DBGFLAGS)
-L
$(LIBPATH1)
$(LIBS)
#-L
$(LIBPATH2)
...
...
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