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
45b2ff40
Commit
45b2ff40
authored
6 years ago
by
WAUTELET Philippe
Browse files
Options
Downloads
Patches
Plain Diff
Philippe 15/03/2019: use MNHREAL from modd_precision
parent
ec0ad639
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/MNH/bl89.f90
+3
-7
3 additions, 7 deletions
src/MNH/bl89.f90
src/MNH/ini_cst.f90
+13
-10
13 additions, 10 deletions
src/MNH/ini_cst.f90
src/MNH/mode_RBK90_Integrator.f90
+2
-5
2 additions, 5 deletions
src/MNH/mode_RBK90_Integrator.f90
with
18 additions
and
22 deletions
src/MNH/bl89.f90
+
3
−
7
View file @
45b2ff40
...
...
@@ -81,6 +81,7 @@ USE MODD_CONF, ONLY: CPROGRAM
USE
MODD_CST
USE
MODD_CTURB
USE
MODD_PARAMETERS
use
modd_precision
,
only
:
MNHREAL
!
!
IMPLICIT
NONE
...
...
@@ -347,13 +348,8 @@ DO JK=IKTB,IKTE
!* 7. final mixing length
!
DO
J1D
=
1
,
IIU
*
IJU
#if (MNH_REAL == 8)
ZLWORK1
=
MAX
(
ZLMDN
(
J1D
,
JK
),
1.E-10
)
ZLWORK2
=
MAX
(
ZLWORK
(
J1D
),
1.E-10
)
#else
ZLWORK1
=
MAX
(
ZLMDN
(
J1D
,
JK
),
1.D-10
)
ZLWORK2
=
MAX
(
ZLWORK
(
J1D
),
1.D-10
)
#endif
ZLWORK1
=
MAX
(
ZLMDN
(
J1D
,
JK
),
1.E-10_MNHREAL
)
ZLWORK2
=
MAX
(
ZLWORK
(
J1D
),
1.E-10_MNHREAL
)
ZPOTE
=
ZLWORK1
/
ZLWORK2
ZLWORK2
=
1.d0
+
ZPOTE
**
(
2.
/
3.
)
ZLM
(
J1D
,
JK
)
=
Z2SQRT2
*
ZLWORK1
/(
ZLWORK2
*
SQRT
(
ZLWORK2
))
...
...
This diff is collapsed.
Click to expand it.
src/MNH/ini_cst.f90
+
13
−
10
View file @
45b2ff40
...
...
@@ -71,6 +71,7 @@ END MODULE MODI_INI_CST
! ------------
!
USE
MODD_CST
use
modd_precision
,
only
:
MNHREAL
!
IMPLICIT
NONE
!
...
...
@@ -160,17 +161,19 @@ XMNH_HUGE = HUGE (XMNH_HUGE )
XMNH_HUGE_12_LOG
=
LOG
(
SQRT
(
XMNH_HUGE
)
)
#if (MNH_REAL == 8)
XMNH_TINY
=
1.0e-80
XEPS_DT
=
1.0e-5
XRES_FLAT_CART
=
1.0e-12
XRES_OTHER
=
1.0e-9
XRES_PREP
=
1.0e-8
#el
se
XMNH_TINY
=
1.0e-80
_MNHREAL
XEPS_DT
=
1.0e-5
_MNHREAL
XRES_FLAT_CART
=
1.0e-12
_MNHREAL
XRES_OTHER
=
1.0e-9
_MNHREAL
XRES_PREP
=
1.0e-8
_MNHREAL
#el
if (MNH_REAL == 4)
XMNH_TINY
=
TINY
(
XMNH_TINY
)
XEPS_DT
=
1.5e-4
XRES_FLAT_CART
=
1.0e-12
XRES_OTHER
=
1.0e-7
XRES_PREP
=
1.0e-4
XEPS_DT
=
1.5e-4_MNHREAL
XRES_FLAT_CART
=
1.0e-12_MNHREAL
XRES_OTHER
=
1.0e-7_MNHREAL
XRES_PREP
=
1.0e-4_MNHREAL
#else
#error "Invalid MNH_REAL"
#endif
XMNH_TINY_12
=
SQRT
(
XMNH_TINY
)
...
...
This diff is collapsed.
Click to expand it.
src/MNH/mode_RBK90_Integrator.f90
+
2
−
5
View file @
45b2ff40
...
...
@@ -61,6 +61,7 @@ MODULE MODE_RBK90_Integrator
USE
MODD_RBK90_JacobianSP_n
,
ONLY
:
LU_DIM_SPECIES
USE
MODD_RBK90_Parameters_n
,
ONLY
:
NVAR
USE
MODD_RBK90_Global_n
,
ONLY
:
STEPMIN
use
modd_precision
,
only
:
MNHREAL
IMPLICIT
NONE
PUBLIC
SAVE
...
...
@@ -737,11 +738,7 @@ Stage: DO istage = 1, ros_S
END
DO
Err
=
SQRT
(
Err
/
N
)
#if (MNH_REAL == 8)
ros_ErrorNorm
=
MAX
(
Err
,
1.0e-10
)
#else
ros_ErrorNorm
=
MAX
(
Err
,
1.0d-10
)
#endif
ros_ErrorNorm
=
MAX
(
Err
,
1.0e-10_MNHREAL
)
END
FUNCTION
ros_ErrorNorm
...
...
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