Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
flexpart
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
5
Issues
5
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
flexpart
flexpart
Commits
23547f36
Commit
23547f36
authored
Nov 14, 2019
by
Ignacio Pisso
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove tabs from files of the form src/*.f90
parent
f612b175
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
17 deletions
+17
-17
src/cbl.f90
src/cbl.f90
+2
-2
src/cmapf_mod.f90
src/cmapf_mod.f90
+1
-1
src/netcdf_output_mod.f90
src/netcdf_output_mod.f90
+1
-1
src/re_initialize_particle.f90
src/re_initialize_particle.f90
+2
-2
src/readlanduse.f90
src/readlanduse.f90
+11
-11
No files found.
src/cbl.f90
View file @
23547f36
...
...
@@ -108,7 +108,7 @@ subroutine cbl(wp,zp,ust,wst,h,rhoa,rhograd,sigmaw,dsigmawdz,tlw,ptot,Q,phi,ath,
radw2
=
w2
**
0.5
dradw2
=
0.5
*
w2
**
(
-0.5
)
*
dw2
!costluar4=0.66667 ! costante da LHH
fluarw
=
costluar4
*
(
cuberoot
(
skew
))
!skew**(1./3.)
fluarw
=
costluar4
*
(
cuberoot
(
skew
))
!skew**(1./3.)
fluarw2
=
fluarw
*
fluarw
if
(
skew
.ne.
0
)
then
...
...
@@ -186,7 +186,7 @@ subroutine cbl(wp,zp,ust,wst,h,rhoa,rhograd,sigmaw,dsigmawdz,tlw,ptot,Q,phi,ath,
pa
=
(
usurad2p
*
(
1.
/
sigmawa
))
*
(
exp
(
-
(
0.5
*
((
deltawa
/
sigmawa
)
**
2.
))))
pb
=
(
usurad2p
*
(
1.
/
sigmawb
))
*
(
exp
(
-
(
0.5
*
((
deltawb
/
sigmawb
)
**
2.
))))
ptot
=
dens
*
aluarw
*
pa
+
dens
*
bluarw
*
pb
aperfa
=
deltawa
*
usurad2
/
sigmawa
...
...
src/cmapf_mod.f90
View file @
23547f36
...
...
@@ -231,7 +231,7 @@ real function cgszll (strcmp, xlat,xlong)
ymerc
=
log
((
1.
+
slat
)
/
(
1.
-
slat
))/
2.
!efact = exp(ymerc)
!cgszll = 2. * strcmp(7) * exp (strcmp(1) * ymerc)
!c
/ (efact + 1./efact)
!c
/ (efact + 1./efact)
endif
cgszll
=
strcmp
(
7
)
*
cos
(
radpdg
*
xlat
)
*
exp
(
strcmp
(
1
)
*
ymerc
)
return
...
...
src/netcdf_output_mod.f90
View file @
23547f36
...
...
@@ -179,7 +179,7 @@ subroutine writemetadata(ncid,lnest)
call
nf90_err
(
nf90_put_att
(
ncid
,
nf90_global
,
'dxout'
,
dxout
))
call
nf90_err
(
nf90_put_att
(
ncid
,
nf90_global
,
'dyout'
,
dyout
))
endif
!
vertical levels stored in grid structure
!
vertical levels stored in grid structure
! COMMAND file settings
call
nf90_err
(
nf90_put_att
(
ncid
,
nf90_global
,
'ldirect'
,
ldirect
))
...
...
src/re_initialize_particle.f90
View file @
23547f36
...
...
@@ -71,7 +71,7 @@ subroutine re_initialize_particle(zp,ust,wst,h,sigmaw,wp,nrand,ol)
if
((
sign
(
1.
,
wp
)
*
timedir
)
.gt.
0
)
then
!updraft
if
((
sign
(
1.
,
wp
)
*
timedir
)
.gt.
0
)
then
!updraft
100
wp
=
(
dcas1
*
sigmawa
+
wa
)
if
(
wp
.lt.
0
)
then
nrand
=
nrand
+1
...
...
@@ -79,7 +79,7 @@ subroutine re_initialize_particle(zp,ust,wst,h,sigmaw,wp,nrand,ol)
goto
100
end
if
wp
=
wp
*
timedir
else
if
((
sign
(
1.
,
wp
)
*
timedir
)
.lt.
0
)
then
!downdraft
else
if
((
sign
(
1.
,
wp
)
*
timedir
)
.lt.
0
)
then
!downdraft
101
wp
=
(
dcas1
*
sigmawb
-
wb
)
if
(
wp
.gt.
0
)
then
nrand
=
nrand
+1
...
...
src/readlanduse.f90
View file @
23547f36
...
...
@@ -29,17 +29,17 @@ subroutine readlanduse
! *
! LANDUSE CATEGORIES: *
! *
! 1
Urban land *
! 2
Agricultural land
*
! 3
Range land
*
! 4
Deciduous forest
*
! 5
Coniferous forest
*
! 6
Mixed forest including wetland *
! 7
water, both salt and fresh *
! 8
barren land mostly desert *
! 9
nonforested wetland
*
! 10
mixed agricultural and range land
*
! 11
rocky open areas with low growing shrubs *
! 1
Urban land *
! 2
Agricultural land
*
! 3
Range land
*
! 4
Deciduous forest
*
! 5
Coniferous forest
*
! 6
Mixed forest including wetland *
! 7
water, both salt and fresh *
! 8
barren land mostly desert *
! 9
nonforested wetland
*
! 10
mixed agricultural and range land
*
! 11
rocky open areas with low growing shrubs *
! 12 ice *
! 13 rainforest *
! *
...
...
Write
Preview
Markdown
is supported
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