From f6ae30c0d07a7e1bfdff8f84ba44b34826dcccdb Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Wed, 22 Aug 2018 11:52:41 -0400 Subject: [PATCH] MOM6: Merge pull request #839 from MJHarrison-GFDL/rotation_angle_diagnostic - Last commit updates available_diags - NOAA-GFDL/MOM6@210c2fb Merge pull request #839 from MJHarrison-GFDL/rotation_angle_diagnostic - NOAA-GFDL/MOM6@e3923d3 correct units for sin/cos grid rotation - NOAA-GFDL/MOM6@8c1ed28 Merge pull request #838 from raymenzel/dev/gfdl - NOAA-GFDL/MOM6@24f3c3f Added grid rotation angle to the list of available static diagnostics - NOAA-GFDL/MOM6@e3ea419 Fixed logic, made ifs one-liners. - NOAA-GFDL/MOM6@9252394 Reordered loops to address a bug when compiled with -O3 using the intel compiler version 16.0.3.210 - NOAA-GFDL/MOM6@ab6a73b Merge remote-tracking branch 'NOAA-GFDL/MOM6/dev/gfdl' into dev/gfdl --- ocean_only/global_ALE/layer/available_diags.000000 | 6 ++++++ ocean_only/global_ALE/z/available_diags.000000 | 6 ++++++ src/MOM6 | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ocean_only/global_ALE/layer/available_diags.000000 b/ocean_only/global_ALE/layer/available_diags.000000 index 1644828258..6d9d18ae5e 100644 --- a/ocean_only/global_ALE/layer/available_diags.000000 +++ b/ocean_only/global_ALE/layer/available_diags.000000 @@ -97,6 +97,12 @@ "ocean_model", "dxCvo" [Unused] ! long_name: Open zonal grid spacing at v points (meter) ! units: m +"ocean_model", "sin_rot" [Unused] + ! long_name: sine of the clockwise angle of the ocean grid north to true north + ! units: none +"ocean_model", "cos_rot" [Unused] + ! long_name: cosine of the clockwise angle of the ocean grid north to true north + ! units: none "ocean_model", "area_t_percent" [Unused] ! long_name: Percentage of cell area covered by ocean ! units: % diff --git a/ocean_only/global_ALE/z/available_diags.000000 b/ocean_only/global_ALE/z/available_diags.000000 index 0487fa6d3e..357ae8de30 100644 --- a/ocean_only/global_ALE/z/available_diags.000000 +++ b/ocean_only/global_ALE/z/available_diags.000000 @@ -97,6 +97,12 @@ "ocean_model", "dxCvo" [Unused] ! long_name: Open zonal grid spacing at v points (meter) ! units: m +"ocean_model", "sin_rot" [Unused] + ! long_name: sine of the clockwise angle of the ocean grid north to true north + ! units: none +"ocean_model", "cos_rot" [Unused] + ! long_name: cosine of the clockwise angle of the ocean grid north to true north + ! units: none "ocean_model", "area_t_percent" [Unused] ! long_name: Percentage of cell area covered by ocean ! units: % diff --git a/src/MOM6 b/src/MOM6 index 85c5dda928..210c2fb5f9 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 85c5dda928e75a5d3d6fc4af6556f6cac9f35f57 +Subproject commit 210c2fb5f97d127ccfaa72f0ea30f2c0268c71de