Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
GOSI9esm
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
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
Consortium Members
UKMO
GOSI
GOSI9esm
Commits
2eaff364
Commit
2eaff364
authored
2 years ago
by
Guillaume Samson
Browse files
Options
Downloads
Patches
Plain Diff
Merge branch '75-offline-transport-not-working-with-linssh' into 'branch_4.2'
parent
9a594bcd
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/OFF/dtadyn.F90
+5
-3
5 additions, 3 deletions
src/OFF/dtadyn.F90
src/OFF/nemogcm.F90
+2
-2
2 additions, 2 deletions
src/OFF/nemogcm.F90
with
7 additions
and
5 deletions
src/OFF/dtadyn.F90
+
5
−
3
View file @
2eaff364
...
...
@@ -24,7 +24,7 @@ MODULE dtadyn
USE
dom_oce
! ocean domain: variables
#if defined key_qco
USE
domqco
! variable volume
#el
se
#el
if ! defined key_linssh
USE
domvvl
#endif
USE
zdf_oce
! ocean vertical physics: variables
...
...
@@ -53,7 +53,7 @@ MODULE dtadyn
PUBLIC
dta_dyn_init
! called by nemo_init
PUBLIC
dta_dyn
! called by nemo_gcm
PUBLIC
dta_dyn_atf
! called by nemo_gcm
#if ! defined key_qco
#if ! defined key_qco
&& ! defined key_linssh
PUBLIC
dta_dyn_sf_interp
! called by nemo_gcm
#endif
#if defined key_sed_off
...
...
@@ -345,6 +345,7 @@ CONTAINS
CALL
iom_close
(
inum
)
! close file
ENDIF
!
#if ! defined key_linssh
#if defined key_qco
CALL
dom_qco_r3c
(
ssh
(:,:,
Kbb
),
r3t
(:,:,
Kbb
),
r3u
(:,:,
Kbb
),
r3v
(:,:,
Kbb
)
)
CALL
dom_qco_r3c
(
ssh
(:,:,
Kmm
),
r3t
(:,:,
Kmm
),
r3u
(:,:,
Kmm
),
r3v
(:,:,
Kmm
)
)
...
...
@@ -356,6 +357,7 @@ CONTAINS
CALL
dta_dyn_sf_interp
(
nit000
,
Kmm
)
CALL
dta_dyn_sf_interp
(
nit000
,
Kbb
)
#endif
#endif
ENDIF
!
...
...
@@ -390,7 +392,7 @@ CONTAINS
END
SUBROUTINE
dta_dyn_atf
#if ! defined key_qco
#if ! defined key_qco
&& ! defined key_linssh
SUBROUTINE
dta_dyn_sf_interp
(
kt
,
Kmm
)
!!---------------------------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
src/OFF/nemogcm.F90
+
2
−
2
View file @
2eaff364
...
...
@@ -62,7 +62,7 @@ MODULE nemogcm
USE
prtctl
! Print control (prt_ctl_init routine)
USE
timing
! Timing
USE
lib_fortran
! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined)
#if defined key_qco
#if defined key_qco
|| defined key_linssh
USE
stpmlf
,
ONLY
:
Nbb
,
Nnn
,
Naa
,
Nrhs
! time level indices
#else
USE
step
,
ONLY
:
Nbb
,
Nnn
,
Naa
,
Nrhs
! time level indices
...
...
@@ -150,7 +150,7 @@ CONTAINS
Nnn
=
Naa
Naa
=
Nrhs
!
# if ! defined key_qco
# if ! defined key_qco
&& ! defined key_linssh
IF
(
.NOT.
ln_linssh
)
CALL
dta_dyn_sf_interp
(
istp
,
Nnn
)
! calculate now grid parameters
# 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