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
e4e3d04c
Commit
e4e3d04c
authored
3 years ago
by
Jérôme Chanut
Committed by
Guillaume Samson
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Allow an AGRIF zoom to run without a sea ice model even if the parent does have one.
parent
7f871a6c
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
cfgs/AGRIF_DEMO/EXPREF/1_context_nemo.xml
+0
-1
0 additions, 1 deletion
cfgs/AGRIF_DEMO/EXPREF/1_context_nemo.xml
cfgs/AGRIF_DEMO/EXPREF/1_namelist_cfg
+4
-1
4 additions, 1 deletion
cfgs/AGRIF_DEMO/EXPREF/1_namelist_cfg
src/OCE/SBC/sbcmod.F90
+9
-2
9 additions, 2 deletions
src/OCE/SBC/sbcmod.F90
with
13 additions
and
4 deletions
cfgs/AGRIF_DEMO/EXPREF/1_context_nemo.xml
+
0
−
1
View file @
e4e3d04c
...
...
@@ -27,7 +27,6 @@
<!-- Files definition -->
<file_definition
src=
"./file_def_nemo-oce.xml"
/>
<!-- NEMO ocean dynamics -->
<file_definition
src=
"./file_def_nemo-ice.xml"
/>
<!-- NEMO ocean sea ice -->
<file_definition
src=
"./file_def_nemo-innerttrc.xml"
/>
<!-- NEMO ocean inert passive tracer -->
<!-- Axis definition -->
...
...
This diff is collapsed.
Click to expand it.
cfgs/AGRIF_DEMO/EXPREF/1_namelist_cfg
+
4
−
1
View file @
e4e3d04c
...
...
@@ -85,7 +85,7 @@
! Type of air-sea fluxes
ln_blk = .true. ! Bulk formulation (T => fill namsbc_blk )
! Sea-ice :
nn_ice =
2
! =0 no ice boundary condition
nn_ice =
0
! =0 no ice boundary condition
! ! =1 use observed ice-cover ( => fill namsbc_iif )
! ! =2 or 3 for SI3 and CICE, respectively
! Misc. options of sbc :
...
...
@@ -361,6 +361,9 @@
!-----------------------------------------------------------------------
&namzdf_tke ! turbulent eddy kinetic dependent vertical diffusion (ln_zdftke =T)
!-----------------------------------------------------------------------
ln_mxl0 = .true. ! surface mixing length scale = F(wind stress) (T) or not (F)
nn_mxlice = 0 ! type of scaling under sea-ice
! ! = 0 no scaling under sea-ice
/
!!======================================================================
!! *** Diagnostics namelists *** !!
...
...
This diff is collapsed.
Click to expand it.
src/OCE/SBC/sbcmod.F90
+
9
−
2
View file @
e4e3d04c
...
...
@@ -39,6 +39,7 @@ MODULE sbcmod
USE
sbcice_if
! surface boundary condition: ice-if sea-ice model
#if defined key_si3
USE
icestp
! surface boundary condition: SI3 sea-ice model
USE
ice
#endif
USE
sbcice_cice
! surface boundary condition: CICE sea-ice model
USE
sbccpl
! surface boundary condition: coupled formulation
...
...
@@ -325,8 +326,14 @@ CONTAINS
IF
(
ln_apr_dyn
)
CALL
sbc_apr_init
! Atmo Pressure Forcing initialization
!
#if defined key_si3
IF
(
lk_agrif
.AND.
nn_ice
==
0
)
THEN
! allocate ice arrays in case agrif + ice-model + no-ice in child grid
IF
(
sbc_ice_alloc
()
/
=
0
)
CALL
ctl_stop
(
'STOP'
,
'sbc_ice_alloc : unable to allocate arrays'
)
IF
(
nn_ice
==
0
)
THEN
#if defined key_agrif
! allocate ice arrays in case agrif + ice-model + no-ice in child grid
jpl
=
1
;
nlay_i
=
1
;
nlay_s
=
1
IF
(
sbc_ice_alloc
()
/
=
0
)
CALL
ctl_stop
(
'STOP'
,
'sbc_ice_alloc : unable to allocate arrays'
)
CALL
Agrif_Declare_Var_ice
! " " " " " Sea ice
#endif
ELSEIF
(
nn_ice
==
2
)
THEN
CALL
ice_init
(
Kbb
,
Kmm
,
Kaa
)
! ICE initialization
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