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
6fba893d
Commit
6fba893d
authored
3 months ago
by
Dethinne Thomas
Browse files
Options
Downloads
Patches
Plain Diff
testing the dual .exe
parent
226ac5a3
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
couplage/CARAIB/ver01_Iv_couplage/caraib_main_01_Iv_couplage.F
+2
-2
2 additions, 2 deletions
...age/CARAIB/ver01_Iv_couplage/caraib_main_01_Iv_couplage.F
couplage/MAR/COMPILE
+40
-11
40 additions, 11 deletions
couplage/MAR/COMPILE
couplage/MAR/call_caraib.f90
+1
-1
1 addition, 1 deletion
couplage/MAR/call_caraib.f90
with
43 additions
and
14 deletions
couplage/CARAIB/ver01_Iv_couplage/caraib_main_01_Iv_couplage.F
+
2
−
2
View file @
6fba893d
subroutine
caraib
Program
caraib
c
//
Fichier
caraib_netcdf_02
.
F
du
jeudi
18
d
�
cembre
2014
,
11
:
51
:
02
(
UTC
+0100
)
c
//
-
completed
enhanced
NetCDF
c
//
Fichier
caraib_netcdf_01
.
F
du
mercredi
17
d
�
cembre
2014
,
08
:
19
:
43
(
UTC
+0100
)
...
...
@@ -916,4 +916,4 @@ cc idayct = idayct + nd
! call system('
cp
.
/
CARAIB_couplage
/
results
/
Belgium
/
*
! . /climato_tmp1/tdethinne/res_car/')
end
subroutine
caraib
\ No newline at end of file
end
Program
caraib
\ No newline at end of file
This diff is collapsed.
Click to expand it.
couplage/MAR/COMPILE
+
40
−
11
View file @
6fba893d
...
...
@@ -506,7 +506,7 @@ case $model in
if
[
$MC
=
"T"
]
;
then
#Compile CARAIB
for
file
in
$mar_adds
$modules_car
;
do
for
file
in
$mar_adds
;
do
$foc
$openmp
$opt
-c
$file
.f90
if
[
$?
-ne
0
]
;
then
Ferror
"
$file
"
...
...
@@ -516,16 +516,7 @@ case $model in
Fgoon
"
$foc
$openmp
$opt
-c
$file
"
fi
done
for
file
in
$carbon_car
$hydro_car
$mod_car
;
do
$foc
$openmp
$opt
-c
-fpp
$file
.f
if
[
$?
-ne
0
]
;
then
Ferror
"
$file
"
DAMNED
"compilation error"
exit
else
Fgoon
"
$foc
$openmp
$opt
-c
$file
"
fi
done
fi
file
=
phyrad_cep.f90
...
...
@@ -555,6 +546,44 @@ case $model in
$foc
$openmp
$opt
*
.o
-o
MAR_
$runnam
.exe radCEP.a
$lnk
fi
tmp
=
$?
if
[
$MC
=
"T"
]
;
then
rm
-rf
*
.o
#Compile CARAIB
for
file
in
$modules1
$modules2
$modules3
$modules4
$modules_car
;
do
$foc
$openmp
$opt
-c
$file
.f90
if
[
$?
-ne
0
]
;
then
Ferror
"
$file
"
DAMNED
"compilation error"
exit
else
Fgoon
"
$foc
$openmp
$opt
-c
$file
"
fi
done
for
file
in
$carbon_car
$hydro_car
$mod_car
;
do
$foc
$openmp
$opt
-c
-fpp
$file
.f
if
[
$?
-ne
0
]
;
then
Ferror
"
$file
"
DAMNED
"compilation error"
exit
else
Fgoon
"
$foc
$openmp
$opt
-c
$file
"
fi
done
fi
if
[
$AO
=
"T"
]
;
then
Fgoon
"
$foc
$openmp
$opt
*.o -o CAR.exe
$LIBPSMILE
-lmpi
$lnk
"
$foc
$openmp
$opt
*
.o
-o
CAR.exe
$LIBPSMILE
-lmpi
$lnk
else
Fgoon
"
$foc
$openmp
$opt
*.o -o CAR.exe
$lnk
"
$foc
$openmp
$opt
*
.o
-o
CAR.exe
$lnk
fi
tmp
=
$?
[
$backup
==
"n"
]
&&
exit
# exit # to uncomment if MAR is recompiled
#
...
...
This diff is collapsed.
Click to expand it.
couplage/MAR/call_caraib.f90
+
1
−
1
View file @
6fba893d
...
...
@@ -88,7 +88,7 @@
write
(
6
,
*
)
"Starting caraib"
call
caraib
call
system
(
'./CAR.exe'
)
!Rename all the files of the first output of CARAIB if its the spin up
if
(
first_iter
.eq.
1
)
CALL
rename_spinup
...
...
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