Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Méso-NH code
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
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RODIER Quentin
Méso-NH code
Commits
75c5783c
Commit
75c5783c
authored
2 years ago
by
WAUTELET Philippe
Browse files
Options
Downloads
Patches
Plain Diff
Philippe 17/03/2023: bugfix: protect operations on optional dummy arguments
parent
8130e6be
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/PHYEX/turb/th_r_from_thl_rt.func.h
+17
-6
17 additions, 6 deletions
src/PHYEX/turb/th_r_from_thl_rt.func.h
with
17 additions
and
6 deletions
src/PHYEX/turb/th_r_from_thl_rt.func.h
+
17
−
6
View file @
75c5783c
!
MNH_LIC
Copyright
2006
-
202
2
CNRS
,
Meteo
-
France
and
Universite
Paul
Sabatier
!
MNH_LIC
Copyright
2006
-
202
3
CNRS
,
Meteo
-
France
and
Universite
Paul
Sabatier
!
MNH_LIC
This
is
part
of
the
Meso
-
NH
software
governed
by
the
CeCILL
-
C
licence
!
MNH_LIC
This
is
part
of
the
Meso
-
NH
software
governed
by
the
CeCILL
-
C
licence
!
MNH_LIC
version
1
.
See
LICENSE
,
CeCILL
-
C_V1
-
en
.
txt
and
CeCILL
-
C_V1
-
fr
.
txt
!
MNH_LIC
version
1
.
See
LICENSE
,
CeCILL
-
C_V1
-
en
.
txt
and
CeCILL
-
C_V1
-
fr
.
txt
!
MNH_LIC
for
details
.
version
1
.
!
MNH_LIC
for
details
.
version
1
.
...
@@ -43,6 +43,7 @@
...
@@ -43,6 +43,7 @@
!!
we
use
dQsat
/
dT
to
help
convergence
!!
we
use
dQsat
/
dT
to
help
convergence
!!
use
of
optional
PRR
,
PRS
,
PRG
,
PRH
!!
use
of
optional
PRR
,
PRS
,
PRG
,
PRH
!!
S
.
Riette
Nov
2016
:
support
for
HFRAC_ICE
=
'S'
!!
S
.
Riette
Nov
2016
:
support
for
HFRAC_ICE
=
'S'
!!
P
.
Wautelet
Mar
2023
:
bugfix
:
protect
operations
on
optional
dummy
arguments
!!
!!
!!
--------------------------------------------------------------------------
!!
--------------------------------------------------------------------------
!
!
...
@@ -74,8 +75,8 @@ REAL, DIMENSION(KT), INTENT(INOUT):: PRI ! vapor mixing ratio
...
@@ -74,8 +75,8 @@ REAL, DIMENSION(KT), INTENT(INOUT):: PRI ! vapor mixing ratio
REAL
,
DIMENSION
(
KT
),
INTENT
(
OUT
)
::
PRSATW
!
estimated
mixing
ration
at
saturation
over
water
REAL
,
DIMENSION
(
KT
),
INTENT
(
OUT
)
::
PRSATW
!
estimated
mixing
ration
at
saturation
over
water
REAL
,
DIMENSION
(
KT
),
INTENT
(
OUT
)
::
PRSATI
!
estimated
mixing
ration
at
saturation
over
ice
REAL
,
DIMENSION
(
KT
),
INTENT
(
OUT
)
::
PRSATI
!
estimated
mixing
ration
at
saturation
over
ice
REAL
,
DIMENSION
(
KT
,
16
),
INTENT
(
OUT
)
::
PBUF
!
buffer
to
replace
automatic
arrays
REAL
,
DIMENSION
(
KT
,
16
),
INTENT
(
OUT
)
::
PBUF
!
buffer
to
replace
automatic
arrays
INTEGER
,
OPTIONAL
::
KB
!
first
index
to
deal
with
(
default
is
1
)
INTEGER
,
OPTIONAL
,
INTENT
(
IN
)
::
KB
!
first
index
to
deal
with
(
default
is
1
)
INTEGER
,
OPTIONAL
::
KE
!
last
index
to
deal
with
(
default
if
KT
)
INTEGER
,
OPTIONAL
,
INTENT
(
IN
)
::
KE
!
last
index
to
deal
with
(
default
if
KT
)
!
!
!-------------------------------------------------------------------------------
!-------------------------------------------------------------------------------
!
!
...
@@ -95,8 +96,18 @@ REAL :: ZVAR1, ZVAR2, ZTPOW2, ZDELT
...
@@ -95,8 +96,18 @@ REAL :: ZVAR1, ZVAR2, ZTPOW2, ZDELT
!
!
!
!
!
!
IB
=
MERGE
(
KB
,
1
,
PRESENT
(
KB
))
IF
(
PRESENT
(
KB
)
)
THEN
IE
=
MERGE
(
KE
,
KT
,
PRESENT
(
KE
))
IB
=
KB
ELSE
IB
=
1
END
IF
IF
(
PRESENT
(
KE
)
)
THEN
IE
=
KE
ELSE
IE
=
KT
END
IF
!
Number
of
iterations
!
Number
of
iterations
JITER
=
2
JITER
=
2
!
!
...
@@ -170,7 +181,7 @@ DO II=1,JITER
...
@@ -170,7 +181,7 @@ DO II=1,JITER
!
Computation
of
new
PRL
,
PRI
and
PRV
!
Computation
of
new
PRL
,
PRI
and
PRV
!
Correction
term
applied
to
(
PRV
(
J
)
-
PBUF
(
J
,
IRVSAT
))
is
computed
assuming
that
!
Correction
term
applied
to
(
PRV
(
J
)
-
PBUF
(
J
,
IRVSAT
))
is
computed
assuming
that
!
PBUF
(
J
,
ILVOCPEXN
),
PBUF
(
J
,
ILSOCPEXN
)
and
PBUF
(
J
,
ICPH
)
don
'
t
vary
to
much
with
T
.
It
takes
into
account
!
PBUF
(
J
,
ILVOCPEXN
),
PBUF
(
J
,
ILSOCPEXN
)
and
PBUF
(
J
,
ICPH
)
don
'
t
vary
to
o
much
with
T
.
It
takes
into
account
!
the
variation
(
estimated
linear
)
of
Qsat
with
T
!
the
variation
(
estimated
linear
)
of
Qsat
with
T
PBUF
(
J
,
IRLTEMP
)
=
(
PRV
(
J
)
-
PBUF
(
J
,
IRVSAT
))
/
&
PBUF
(
J
,
IRLTEMP
)
=
(
PRV
(
J
)
-
PBUF
(
J
,
IRVSAT
))
/
&
&
(
1
+
PBUF
(
J
,
IDRSATODT
)
*
PBUF
(
J
,
IEXN
)
*
&
&
(
1
+
PBUF
(
J
,
IDRSATODT
)
*
PBUF
(
J
,
IEXN
)
*
&
...
...
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