Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Nemo
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
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
Sam Hatfield
Nemo
Commits
f6b09d31
Commit
f6b09d31
authored
3 years ago
by
sibylle
Browse files
Options
Downloads
Patches
Plain Diff
fix salt2c use
parent
b13ef418
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
cfgs/SHARED/field_def_nemo-oce.xml
+2
-3
2 additions, 3 deletions
cfgs/SHARED/field_def_nemo-oce.xml
src/OCE/DIA/diawri.F90
+1
-1
1 addition, 1 deletion
src/OCE/DIA/diawri.F90
with
3 additions
and
4 deletions
cfgs/SHARED/field_def_nemo-oce.xml
+
2
−
3
View file @
f6b09d31
...
...
@@ -134,7 +134,6 @@ that are available in the tidal-forcing implementation (see
<field
id=
"sssgrad2"
long_name=
"square of module of surface salinity gradient"
unit=
"1e-6/m2"
grid_ref=
"grid_T_2D_inner"
/>
<field
id=
"ke"
long_name=
"kinetic energy"
standard_name=
"specific_kinetic_energy_of_sea_water"
unit=
"m2/s2"
grid_ref=
"grid_T_3D"
/>
<field
id=
"ke_int"
long_name=
"vertical integration of kinetic energy"
unit=
"m3/s2"
grid_ref=
"grid_T_2D_inner"
/>
<field
id=
"salt2c"
long_name=
"Salt content vertically integrated"
unit=
"1e-3*kg/m2"
/>
<!-- t-eddy viscosity coefficients (ldfdyn) -->
<field
id=
"ahmt_2d"
long_name=
" surface t-eddy viscosity coefficient"
unit=
"m2/s or m4/s"
/>
...
...
@@ -178,8 +177,8 @@ that are available in the tidal-forcing implementation (see
<field
id=
"mldr10_1max"
long_name=
"Max of Mixed Layer Depth (dsigma = 0.01 wrt 10m)"
field_ref=
"mldr10_1"
operation=
"maximum"
/>
<field
id=
"mldr10_1min"
long_name=
"Min of Mixed Layer Depth (dsigma = 0.01 wrt 10m)"
field_ref=
"mldr10_1"
operation=
"minimum"
/>
<field
id=
"heatc"
long_name=
"Heat content vertically integrated"
standard_name=
"integral_of_sea_water_potential_temperature_wrt_depth_expressed_as_heat_content"
unit=
"J/m2"
grid_ref=
"grid_T_2D_inner"
/>
<field
id=
"saltc"
long_name=
"Salt content vertically integrated"
unit=
"
1e-3.m
"
grid_ref=
"grid_T_2D_inner"
/>
<field
id=
"salt
c
2"
long_name=
"square of Salt content vertically integrated"
unit=
"
1e-6.
m2"
grid_ref=
"grid_T_2D_inner"
/>
<field
id=
"saltc"
long_name=
"Salt content vertically integrated"
unit=
"
PSU*kg/m2
"
grid_ref=
"grid_T_2D_inner"
/>
<field
id=
"salt2
c
"
long_name=
"square of Salt content vertically integrated"
unit=
"
PSU2*kg/
m2"
grid_ref=
"grid_T_2D_inner"
/>
<!-- EOS -->
<field
id=
"alpha"
long_name=
"thermal expansion"
unit=
"degC-1"
grid_ref=
"grid_T_3D"
/>
...
...
This diff is collapsed.
Click to expand it.
src/OCE/DIA/diawri.F90
+
1
−
1
View file @
f6b09d31
...
...
@@ -355,7 +355,7 @@ CONTAINS
DO_3D
(
0
,
0
,
0
,
0
,
1
,
jpkm1
)
z2d
(
ji
,
jj
)
=
z2d
(
ji
,
jj
)
+
e3t
(
ji
,
jj
,
jk
,
Kmm
)
*
ts
(
ji
,
jj
,
jk
,
jp_sal
,
Kmm
)
*
ts
(
ji
,
jj
,
jk
,
jp_sal
,
Kmm
)
*
tmask
(
ji
,
jj
,
jk
)
END_3D
CALL
iom_put
(
"salt2c"
,
rho0
*
z2d
)
! vertically integrated salt content (PSU*kg/m2)
CALL
iom_put
(
"salt2c"
,
rho0
*
z2d
)
! vertically integrated
square of
salt content (PSU
2
*kg/m2)
ENDIF
!
IF
(
iom_use
(
"ke"
)
.OR.
iom_use
(
"ke_int"
)
)
THEN
...
...
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