From b29cc190a00b642ded8732f182e143a0a39b6412 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Mon, 27 Apr 2015 22:33:01 -0400 Subject: [PATCH] SIS2 bug fixes from CommerceGov/NOAA-GFDL-MOM#149 CommerceGov/NOAA-GFDL-SIS2@67a04e5 Bugfix: uninitialized variables domore_u, domore_v CommerceGov/NOAA-GFDL-SIS2@eb1d222 Bugfix: uninitialized variable G%first_direction - CommerceGov/NOAA-GFDL-SIS2@eb1d222 changed all the SIS_parameter_doc.all files. - No answer changes. --- .../AM2_SIS2B_MOM6i_1deg/SIS_parameter_doc.all | 5 +++++ .../AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.all | 5 +++++ ice_ocean_SIS2/Baltic/SIS_parameter_doc.all | 5 +++++ ice_ocean_SIS2/OM4_025/SIS_parameter_doc.all | 5 +++++ ice_ocean_SIS2/SIS2/SIS_parameter_doc.all | 5 +++++ ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.all | 5 +++++ ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.all | 5 +++++ ice_ocean_SIS2/SIS2_icebergs/SIS_parameter_doc.all | 5 +++++ src/SIS2 | 2 +- 9 files changed, 41 insertions(+), 1 deletion(-) diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2B_MOM6i_1deg/SIS_parameter_doc.all b/coupled_AM2_LM3_SIS2/AM2_SIS2B_MOM6i_1deg/SIS_parameter_doc.all index e9a8fc1636..ff7d2276f7 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2B_MOM6i_1deg/SIS_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2B_MOM6i_1deg/SIS_parameter_doc.all @@ -129,6 +129,11 @@ NK_SNOW = 1 ! [nondim] default = 1 H_TO_KG_M2 = 1.0 ! [kg m-2 H-1] default = 1.0 ! A constant that translates thicknesses from the model's ! internal units of thickness to kg m-2. +FIRST_DIRECTION = 0 ! default = 0 + ! An integer that indicates which direction goes first + ! in parts of the code that use directionally split + ! updates, with even numbers (or 0) used for x- first + ! and odd numbers used for y-first. GRID_FILE = "ocean_hgrid.nc" ! ! Name of the file from which to read horizontal grid data. INPUTDIR = "INPUT" ! default = "." diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.all b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.all index 2eedf419b7..602706651a 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.all @@ -129,6 +129,11 @@ NK_SNOW = 1 ! [nondim] default = 1 H_TO_KG_M2 = 1.0 ! [kg m-2 H-1] default = 1.0 ! A constant that translates thicknesses from the model's ! internal units of thickness to kg m-2. +FIRST_DIRECTION = 0 ! default = 0 + ! An integer that indicates which direction goes first + ! in parts of the code that use directionally split + ! updates, with even numbers (or 0) used for x- first + ! and odd numbers used for y-first. GRID_FILE = "ocean_hgrid.nc" ! ! Name of the file from which to read horizontal grid data. INPUTDIR = "INPUT" ! default = "." diff --git a/ice_ocean_SIS2/Baltic/SIS_parameter_doc.all b/ice_ocean_SIS2/Baltic/SIS_parameter_doc.all index e6cd350dbc..b31e841338 100644 --- a/ice_ocean_SIS2/Baltic/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/SIS_parameter_doc.all @@ -129,6 +129,11 @@ NK_SNOW = 1 ! [nondim] default = 1 H_TO_KG_M2 = 1.0 ! [kg m-2 H-1] default = 1.0 ! A constant that translates thicknesses from the model's ! internal units of thickness to kg m-2. +FIRST_DIRECTION = 0 ! default = 0 + ! An integer that indicates which direction goes first + ! in parts of the code that use directionally split + ! updates, with even numbers (or 0) used for x- first + ! and odd numbers used for y-first. GRID_FILE = "ocean_hgrid.nc" ! ! Name of the file from which to read horizontal grid data. INPUTDIR = "INPUT" ! default = "." diff --git a/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.all b/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.all index 5256601970..0bcf9b4187 100644 --- a/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.all @@ -129,6 +129,11 @@ NK_SNOW = 1 ! [nondim] default = 1 H_TO_KG_M2 = 1.0 ! [kg m-2 H-1] default = 1.0 ! A constant that translates thicknesses from the model's ! internal units of thickness to kg m-2. +FIRST_DIRECTION = 0 ! default = 0 + ! An integer that indicates which direction goes first + ! in parts of the code that use directionally split + ! updates, with even numbers (or 0) used for x- first + ! and odd numbers used for y-first. GRID_FILE = "ocean_hgrid.nc" ! ! Name of the file from which to read horizontal grid data. INPUTDIR = "INPUT" ! default = "." diff --git a/ice_ocean_SIS2/SIS2/SIS_parameter_doc.all b/ice_ocean_SIS2/SIS2/SIS_parameter_doc.all index 5917d11a70..20eeba61d4 100644 --- a/ice_ocean_SIS2/SIS2/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/SIS_parameter_doc.all @@ -129,6 +129,11 @@ NK_SNOW = 1 ! [nondim] default = 1 H_TO_KG_M2 = 1.0 ! [kg m-2 H-1] default = 1.0 ! A constant that translates thicknesses from the model's ! internal units of thickness to kg m-2. +FIRST_DIRECTION = 0 ! default = 0 + ! An integer that indicates which direction goes first + ! in parts of the code that use directionally split + ! updates, with even numbers (or 0) used for x- first + ! and odd numbers used for y-first. GRID_FILE = "ocean_hgrid.nc" ! ! Name of the file from which to read horizontal grid data. INPUTDIR = "INPUT" ! default = "." diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.all index 15cb78ae00..16c250ec00 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.all @@ -129,6 +129,11 @@ NK_SNOW = 1 ! [nondim] default = 1 H_TO_KG_M2 = 1.0 ! [kg m-2 H-1] default = 1.0 ! A constant that translates thicknesses from the model's ! internal units of thickness to kg m-2. +FIRST_DIRECTION = 0 ! default = 0 + ! An integer that indicates which direction goes first + ! in parts of the code that use directionally split + ! updates, with even numbers (or 0) used for x- first + ! and odd numbers used for y-first. GRID_FILE = "ocean_hgrid.nc" ! ! Name of the file from which to read horizontal grid data. INPUTDIR = "INPUT" ! default = "." diff --git a/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.all index 7ef503f9c4..f17e0c728f 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.all @@ -129,6 +129,11 @@ NK_SNOW = 1 ! [nondim] default = 1 H_TO_KG_M2 = 1.0 ! [kg m-2 H-1] default = 1.0 ! A constant that translates thicknesses from the model's ! internal units of thickness to kg m-2. +FIRST_DIRECTION = 0 ! default = 0 + ! An integer that indicates which direction goes first + ! in parts of the code that use directionally split + ! updates, with even numbers (or 0) used for x- first + ! and odd numbers used for y-first. GRID_FILE = "ocean_hgrid.nc" ! ! Name of the file from which to read horizontal grid data. INPUTDIR = "INPUT" ! default = "." diff --git a/ice_ocean_SIS2/SIS2_icebergs/SIS_parameter_doc.all b/ice_ocean_SIS2/SIS2_icebergs/SIS_parameter_doc.all index ef4178d312..733b8c53ad 100644 --- a/ice_ocean_SIS2/SIS2_icebergs/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_icebergs/SIS_parameter_doc.all @@ -129,6 +129,11 @@ NK_SNOW = 1 ! [nondim] default = 1 H_TO_KG_M2 = 1.0 ! [kg m-2 H-1] default = 1.0 ! A constant that translates thicknesses from the model's ! internal units of thickness to kg m-2. +FIRST_DIRECTION = 0 ! default = 0 + ! An integer that indicates which direction goes first + ! in parts of the code that use directionally split + ! updates, with even numbers (or 0) used for x- first + ! and odd numbers used for y-first. GRID_FILE = "ocean_hgrid.nc" ! ! Name of the file from which to read horizontal grid data. INPUTDIR = "INPUT" ! default = "." diff --git a/src/SIS2 b/src/SIS2 index 500fdd4cbc..67a04e59f2 160000 --- a/src/SIS2 +++ b/src/SIS2 @@ -1 +1 @@ -Subproject commit 500fdd4cbc5d51e538c0fe9a2c7bc2e916a868ed +Subproject commit 67a04e59f243c31403bdeb7d15a608a955a8feb8