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
Méso-NH
Méso-NH code
Commits
b7f18ae9
Commit
b7f18ae9
authored
10 years ago
by
ESCOBAR MUNOZ Juan
Committed by
WAUTELET Philippe
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Maud & Juan : 6/11/2014 Bug in pH computing
parent
f22fe00d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/MNH/ch_monitorn.f90
+1
-3
1 addition, 3 deletions
src/MNH/ch_monitorn.f90
src/MNH/read_field.f90
+3
-3
3 additions, 3 deletions
src/MNH/read_field.f90
with
4 additions
and
6 deletions
src/MNH/ch_monitorn.f90
+
1
−
3
View file @
b7f18ae9
...
@@ -106,6 +106,7 @@ END MODULE MODI_CH_MONITOR_n
...
@@ -106,6 +106,7 @@ END MODULE MODI_CH_MONITOR_n
!! + supress line transfer H2SO4 from AP to gas phase
!! + supress line transfer H2SO4 from AP to gas phase
!! imply transfer H2SO4 AP in aqueous phase if aq.chem.
!! imply transfer H2SO4 AP in aqueous phase if aq.chem.
!! 04/2014 (C.Lac) Remove GCENTER with FIT temporal scheme
!! 04/2014 (C.Lac) Remove GCENTER with FIT temporal scheme
!! 06/11/14 (M Leriche) Bug in pH computing
!!
!!
!! EXTERNAL
!! EXTERNAL
!! --------
!! --------
...
@@ -1085,7 +1086,6 @@ DO JL=1,ISVECNMASK
...
@@ -1085,7 +1086,6 @@ DO JL=1,ISVECNMASK
IF
(
LUSECHAQ
.AND.
LCH_PH
)
THEN
IF
(
LUSECHAQ
.AND.
LCH_PH
)
THEN
SELECT
CASE
(
NRRL
)
SELECT
CASE
(
NRRL
)
CASE
(
1
)
CASE
(
1
)
XPHC
(:,:,:)
=
0.0
DO
JM
=
0
,
ISVECNPT
-1
DO
JM
=
0
,
ISVECNPT
-1
JI
=
JM
-
IDTI
*
(
JM
/
IDTI
)
+
ISVECMASK
(
1
,
JL
)
JI
=
JM
-
IDTI
*
(
JM
/
IDTI
)
+
ISVECMASK
(
1
,
JL
)
JJ
=
JM
/
IDTI
-
IDTJ
*
(
JM
/(
IDTI
*
IDTJ
))
+
ISVECMASK
(
3
,
JL
)
JJ
=
JM
/
IDTI
-
IDTJ
*
(
JM
/(
IDTI
*
IDTJ
))
+
ISVECMASK
(
3
,
JL
)
...
@@ -1093,8 +1093,6 @@ DO JL=1,ISVECNMASK
...
@@ -1093,8 +1093,6 @@ DO JL=1,ISVECNMASK
XPHC
(
JI
,
JJ
,
JK
)
=
ZPH
(
JM
+1
,
1
)
XPHC
(
JI
,
JJ
,
JK
)
=
ZPH
(
JM
+1
,
1
)
END
DO
END
DO
CASE
(
2
)
CASE
(
2
)
XPHC
(:,:,:)
=
0.0
XPHR
(:,:,:)
=
0.0
DO
JM
=
0
,
ISVECNPT
-1
DO
JM
=
0
,
ISVECNPT
-1
JI
=
JM
-
IDTI
*
(
JM
/
IDTI
)
+
ISVECMASK
(
1
,
JL
)
JI
=
JM
-
IDTI
*
(
JM
/
IDTI
)
+
ISVECMASK
(
1
,
JL
)
JJ
=
JM
/
IDTI
-
IDTJ
*
(
JM
/(
IDTI
*
IDTJ
))
+
ISVECMASK
(
3
,
JL
)
JJ
=
JM
/
IDTI
-
IDTJ
*
(
JM
/(
IDTI
*
IDTJ
))
+
ISVECMASK
(
3
,
JL
)
...
...
This diff is collapsed.
Click to expand it.
src/MNH/read_field.f90
+
3
−
3
View file @
b7f18ae9
...
@@ -224,6 +224,7 @@ END MODULE MODI_READ_FIELD
...
@@ -224,6 +224,7 @@ END MODULE MODI_READ_FIELD
!! P. Peyrille 06/12 2D west african monsoon : add reading of ADV forcing and addy fluxes
!! P. Peyrille 06/12 2D west african monsoon : add reading of ADV forcing and addy fluxes
!! C.Lac 03/13 add prognostic supersaturation for C2R2/KHKO
!! C.Lac 03/13 add prognostic supersaturation for C2R2/KHKO
!! Bosseur & Filippi 07/13 Adds Forefire
!! Bosseur & Filippi 07/13 Adds Forefire
!! M. Leriche 11/14 correct bug in pH initialization
!!-------------------------------------------------------------------------------
!!-------------------------------------------------------------------------------
!
!
!* 0. DECLARATIONS
!* 0. DECLARATIONS
...
@@ -243,7 +244,6 @@ USE MODD_PASPOL
...
@@ -243,7 +244,6 @@ USE MODD_PASPOL
USE
MODD_FOREFIRE
USE
MODD_FOREFIRE
#endif
#endif
USE
MODD_CH_AEROSOL
USE
MODD_CH_AEROSOL
USE
MODD_CH_MNHC_n
,
ONLY
:
XCH_PHINIT
!
!
USE
MODD_RAIN_C2R2_DESCR
,
ONLY
:
C2R2NAMES
USE
MODD_RAIN_C2R2_DESCR
,
ONLY
:
C2R2NAMES
USE
MODD_ICE_C1R3_DESCR
,
ONLY
:
C1R3NAMES
USE
MODD_ICE_C1R3_DESCR
,
ONLY
:
C1R3NAMES
...
@@ -987,7 +987,7 @@ SELECT CASE(HGETPHC) ! pH in cloud water
...
@@ -987,7 +987,7 @@ SELECT CASE(HGETPHC) ! pH in cloud water
CALL
FMREAD
(
HINIFILE
,
YRECFM
,
HLUOUT
,
YDIR
,
PPHC
,
IGRID
,
ILENCH
,
&
CALL
FMREAD
(
HINIFILE
,
YRECFM
,
HLUOUT
,
YDIR
,
PPHC
,
IGRID
,
ILENCH
,
&
YCOMMENT
,
IRESP
)
YCOMMENT
,
IRESP
)
CASE
(
'INIT'
)
CASE
(
'INIT'
)
PPHC
(:,:,:)
=
XCH_PHINIT
PPHC
(:,:,:)
=
0.
END
SELECT
END
SELECT
!
!
SELECT
CASE
(
HGETPHR
)
! pH in rainwater
SELECT
CASE
(
HGETPHR
)
! pH in rainwater
...
@@ -997,7 +997,7 @@ SELECT CASE(HGETPHR) ! pH in rainwater
...
@@ -997,7 +997,7 @@ SELECT CASE(HGETPHR) ! pH in rainwater
CALL
FMREAD
(
HINIFILE
,
YRECFM
,
HLUOUT
,
YDIR
,
PPHR
,
IGRID
,
ILENCH
,
&
CALL
FMREAD
(
HINIFILE
,
YRECFM
,
HLUOUT
,
YDIR
,
PPHR
,
IGRID
,
ILENCH
,
&
YCOMMENT
,
IRESP
)
YCOMMENT
,
IRESP
)
CASE
(
'INIT'
)
CASE
(
'INIT'
)
PPHR
(:,:,:)
=
XCH_PHINIT
PPHR
(:,:,:)
=
0.
END
SELECT
END
SELECT
!
!
IRESP
=
0
IRESP
=
0
...
...
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