Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
MAR - CARAIB
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Package Registry
Operate
Terraform modules
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dethinne Thomas
MAR - CARAIB
Commits
b4b5e365
Commit
b4b5e365
authored
6 months ago
by
Dethinne Thomas
Browse files
Options
Downloads
Patches
Plain Diff
remove CAR code from iniglf
parent
cd6580ab
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
couplage/MAR/call_caraib.f90
+31
-1
31 additions, 1 deletion
couplage/MAR/call_caraib.f90
couplage/MAR/iniglf.f90
+12
-24
12 additions, 24 deletions
couplage/MAR/iniglf.f90
with
43 additions
and
25 deletions
couplage/MAR/call_caraib.f90
+
31
−
1
View file @
b4b5e365
...
@@ -21,6 +21,7 @@
...
@@ -21,6 +21,7 @@
use
mardim
use
mardim
use
marcar
use
marcar
use
mar_ge
use
mar_ge
use
mar_vb
IMPLICIT
NONE
IMPLICIT
NONE
...
@@ -93,9 +94,38 @@
...
@@ -93,9 +94,38 @@
! +--CASES called in iniglf.f90
! +--CASES called in iniglf.f90
! + ==========================
! + ==========================
! +
! +
! check if a .nc exists
CASE
(
10
)
CASE
(
10
)
INQUIRE
(
FILE
=
"MARglf.nc"
,
EXIST
=
file_exists
)
INQUIRE
(
FILE
=
"MARglf.nc"
,
EXIST
=
file_exists
)
CASE
(
11
)
if
(
file_exists
)
then
call
CF_READ2D
(
'MARglf.nc'
,
'LAI'
,
1
,
mx
,
my
,
nvx
,
lai_caraib
)
call
CF_READ2D
(
'MARglf.nc'
,
'GLF'
,
1
,
mx
,
my
,
nvx
,
glf_caraib
)
else
open
(
unit
=
11
,
status
=
'old'
,
form
=
'unformatted'
,
file
=
'MARglf.DAT'
)
rewind
11
endif
! Read th NESTOR file of CARAIB file dependinf on the coupling
CASE
(
12
)
if
(
file_exists
)
then
glf2VB
=
glf_caraib
LAI2VB
=
lai_caraib
iyr_VB
=
iyrrGE
mma_VB
=
mmarGE
jda_VB
=
jdarGE
jhu_VB
=
jhurGE
+1
!!!!!!!!!!!!!!!!!!!
jdh_VB
=
6
! temps entre 2 forçage --> hard codé ici
!!!!!!!!!!!!!!!!!!!
else
read
(
11
)
iyr_VB
,
mma_VB
,
jda_VB
,
jhu_VB
,
jdh_VB
read
(
11
)
glf2VB
read
(
11
)
LAI2VB
endif
CASE
DEFAULT
CASE
DEFAULT
write
(
6
,
*
)
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
write
(
6
,
*
)
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
...
...
This diff is collapsed.
Click to expand it.
couplage/MAR/iniglf.f90
+
12
−
24
View file @
b4b5e365
...
@@ -114,14 +114,12 @@ subroutine INIglf(ihamr_glf, nhamr_glf, newglfINI)
...
@@ -114,14 +114,12 @@ subroutine INIglf(ihamr_glf, nhamr_glf, newglfINI)
if
(
jdh_VB
==
0
)
jdh_VB
=
-1
if
(
jdh_VB
==
0
)
jdh_VB
=
-1
if
(
.not.
file_exists
.or.
.not.
CAR
coupling
)
then
! Read th NESTOR file of CARAIB file dependinf on the
coupling
open
(
unit
=
11
,
status
=
'old'
,
form
=
'unformatted'
,
file
=
'MARglf.DAT'
)
if
(
CARcoupling
.eq.
.true.
)
then
rewind
11
call
call_caraib
(
11
)
else
else
open
(
unit
=
11
,
status
=
'old'
,
form
=
'unformatted'
,
file
=
'MARglf.DAT'
)
call
CF_READ2D
(
'MARglf.nc'
,
'LAI'
,
1
,
mx
,
my
,
nvx
,
lai_caraib
)
rewind
11
call
CF_READ2D
(
'MARglf.nc'
,
'GLF'
,
1
,
mx
,
my
,
nvx
,
glf_caraib
)
endif
endif
11
continue
11
continue
...
@@ -153,24 +151,14 @@ subroutine INIglf(ihamr_glf, nhamr_glf, newglfINI)
...
@@ -153,24 +151,14 @@ subroutine INIglf(ihamr_glf, nhamr_glf, newglfINI)
! + ----------------------------
! + ----------------------------
! +
! +
!On lit les infos dans le fichier
!On lit les infos dans le fichier
if
(
.not.
file_exists
)
then
if
(
CARcoupling
.eq.
.true.
)
then
read
(
11
)
iyr_VB
,
mma_VB
,
jda_VB
,
jhu_VB
,
jdh_VB
call
call_caraib
(
12
)
read
(
11
)
glf2VB
read
(
11
)
LAI2VB
else
glf2VB
=
glf_caraib
LAI2VB
=
lai_caraib
iyr_VB
=
iyrrGE
mma_VB
=
mmarGE
jda_VB
=
jdarGE
jhu_VB
=
jhurGE
+1
!!!!!!!!!!!!!!!!!!!
else
jdh_VB
=
6
! temps entre 2 forçage --> hard codé ici
read
(
11
)
iyr_VB
,
mma_VB
,
jda_VB
,
jhu_VB
,
jdh_VB
!!!!!!!!!!!!!!!!!!!
read
(
11
)
glf2VB
read
(
11
)
LAI2VB
endif
endif
! +
! +
...
...
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