Skip to content

Commit e9ac003

Browse files
timspainNERSCtimspainNERSC
committed
Remove the U ModelArray type.
1 parent 09f61f8 commit e9ac003

File tree

10 files changed

+14
-53
lines changed

10 files changed

+14
-53
lines changed

‎core/src/ModelComponent.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,9 @@ ModelArray ModelComponent::mask(const ModelArray& data)
6464
break;
6565
}
6666
case (ModelArray::Type::H):
67-
case (ModelArray::Type::U):
68-
case (ModelArray::Type::V): {
6967
return data * oceanMask() + MissingData::value() * (1 - oceanMask());
7068
break;
7169
}
72-
}
7370
}
7471

7572
const ModelArray& ModelComponent::oceanMask() { return oceanMaskSingleton(); }

‎core/src/RectGridIO.cpp‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,21 +77,11 @@ ModelState RectGridIO::getModelState(const std::string& filePath)
7777
netCDF::NcGroup dataGroup(ncFile.getGroup(IStructure::dataNodeName()));
7878

7979
#ifdef USE_MPI
80-
// Get the sizes of the four types of field
81-
// HField from hice
80+
// Get the sizes of the HField from hice
8281
dimensionSetter(dataGroup, hiceName, ModelArray::Type::H, metadata);
83-
// UField from hice
84-
dimensionSetter(dataGroup, hiceName, ModelArray::Type::U, metadata);
85-
// VField from hice
86-
dimensionSetter(dataGroup, hiceName, ModelArray::Type::V, metadata);
8782
#else
88-
// Get the sizes of the four types of field
89-
// HField from hice
83+
// Get the sizes of the HField from hice
9084
dimensionSetter(dataGroup, hiceName, ModelArray::Type::H);
91-
// UField from hice
92-
dimensionSetter(dataGroup, hiceName, ModelArray::Type::U);
93-
// VField from hice
94-
dimensionSetter(dataGroup, hiceName, ModelArray::Type::V);
9585
#endif
9686

9787
#ifdef USE_MPI

‎core/src/discontinuousgalerkin/ModelArrayDetails.cpp‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,6 @@ ModelArray::TypeDimensions ModelArray::typeDimensions = {
5151
ModelArray::Dimension::XVERTEX,
5252
ModelArray::Dimension::YVERTEX,
5353
} },
54-
{ ModelArray::Type::U,
55-
{
56-
ModelArray::Dimension::X,
57-
ModelArray::Dimension::Y,
58-
} },
59-
{ ModelArray::Type::V,
60-
{
61-
ModelArray::Dimension::X,
62-
ModelArray::Dimension::Y,
63-
} },
6454
{ ModelArray::Type::DG,
6555
{
6656
ModelArray::Dimension::X,
@@ -81,8 +71,6 @@ ModelArray::TypeDimensions ModelArray::typeDimensions = {
8171
const std::map<ModelArray::Type, std::string> ModelArray::typeNames = {
8272
{ ModelArray::Type::H, "HField" },
8373
{ ModelArray::Type::VERTEX, "VertexField" },
84-
{ ModelArray::Type::U, "UField" },
85-
{ ModelArray::Type::V, "VField" },
8674
{ ModelArray::Type::DG, "DGField" },
8775
{ ModelArray::Type::DGSTRESS, "DGStressField" },
8876
{ ModelArray::Type::CG, "CGField" },
@@ -99,17 +87,15 @@ bool ModelArray::hasDoF(const Type type)
9987
}
10088

10189
ModelArray::SizeMap::SizeMap()
102-
: m_sizes({ { Type::H, 0 }, { Type::VERTEX, 1 }, { Type::U, 0 }, { Type::V, 0 },
103-
{ Type::DG, 0 }, { Type::DGSTRESS, 0 }, { Type::CG, 1 } })
90+
: m_sizes( { { Type::H, 0 }, { Type::VERTEX, 1 }, { Type::DG, 0 }, { Type::DGSTRESS, 0 }, {
91+
Type::CG, 1 } })
10492
{
10593
}
10694

10795
ModelArray::DimensionMap::DimensionMap()
10896
: m_dimensions({
10997
{ Type::H, { 0, 0 } },
11098
{ Type::VERTEX, { 1, 1 } },
111-
{ Type::U, { 0, 0 } },
112-
{ Type::V, { 0, 0 } },
11399
{ Type::DG, { 0, 0 } },
114100
{ Type::DGSTRESS, { 0, 0 } },
115101
{ Type::CG, { 1, 1 } },

‎core/src/discontinuousgalerkin/include/ModelArrayDetails.hpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ enum class Dimension { X, Y, XVERTEX, YVERTEX, XCG, YCG, DG, DGSTRESS, NCOORDS,
1616
enum class Type {
1717
H,
1818
VERTEX,
19-
U,
20-
V,
2119
DG,
2220
DGSTRESS,
2321
CG,
@@ -27,8 +25,6 @@ static const Type AdvectionType = Type::DG;
2725

2826
static ModelArray HField() { return ModelArray(Type::H); }
2927
static ModelArray VertexField() { return ModelArray(Type::VERTEX); }
30-
static ModelArray UField() { return ModelArray(Type::U); }
31-
static ModelArray VField() { return ModelArray(Type::V); }
3228
static ModelArray DGField() { return ModelArray(Type::DG); }
3329
static ModelArray DGSField() { return ModelArray(Type::DGSTRESS); }
3430
static ModelArray CGField() { return ModelArray(Type::CG); }

‎core/src/discontinuousgalerkin/include/ModelArrayTypedefs.hpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
typedef ModelArray HField;
1111
typedef ModelArray VertexField;
12-
typedef ModelArray UField;
13-
typedef ModelArray VField;
1412
typedef ModelArray DGField;
1513
typedef ModelArray DGSField;
1614
typedef ModelArray CGField;

‎core/src/finitevolume/include/ModelArrayTypedefs.hpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,4 @@
88
// ModelArrayDetails.cpp
99

1010
typedef ModelArray HField;
11-
typedef ModelArray UField;
12-
typedef ModelArray VField;
1311
typedef ModelArray VertexField;

‎dynamics/src/CGDynamicsKernel.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,22 +85,22 @@ template <int DGadvection>
8585
ModelArray CGDynamicsKernel<DGadvection>::getDG0Data(const std::string& name) const
8686
{
8787
if (name == uName) {
88-
ModelArray data(ModelArray::Type::U);
88+
ModelArray data(ModelArray::Type::H);
8989
DGVector<DGadvection> utmp(*smesh);
9090
Nextsim::Interpolations::CG2DG(*smesh, utmp, u);
9191
return DGModelArray::dg2ma(utmp, data);
9292
} else if (name == vName) {
93-
ModelArray data(ModelArray::Type::V);
93+
ModelArray data(ModelArray::Type::H);
9494
DGVector<DGadvection> vtmp(*smesh);
9595
Nextsim::Interpolations::CG2DG(*smesh, vtmp, v);
9696
return DGModelArray::dg2ma(vtmp, data);
9797
} else if (name == uIOStressName) {
98-
ModelArray data(ModelArray::Type::U);
98+
ModelArray data(ModelArray::Type::H);
9999
DGVector<DGadvection> utmp(*smesh);
100100
Nextsim::Interpolations::CG2DG(*smesh, utmp, uIceOceanStress);
101101
return DGModelArray::dg2ma(utmp, data);
102102
} else if (name == vIOStressName) {
103-
ModelArray data(ModelArray::Type::V);
103+
ModelArray data(ModelArray::Type::H);
104104
DGVector<DGadvection> vtmp(*smesh);
105105
Nextsim::Interpolations::CG2DG(*smesh, vtmp, vIceOceanStress);
106106
return DGModelArray::dg2ma(vtmp, data);

‎physics/src/modules/include/IAtmosphereBoundary.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ class IAtmosphereBoundary : public ModelComponent {
2323
, snow(ModelArray::Type::H)
2424
, rain(ModelArray::Type::H)
2525
, evap(ModelArray::Type::H)
26-
, uwind(ModelArray::Type::U)
27-
, vwind(ModelArray::Type::V)
26+
, uwind(ModelArray::Type::H)
27+
, vwind(ModelArray::Type::H)
2828
, penSW(ModelArray::Type::H)
2929
, tauXOW(ModelArray::Type::H)
3030
, tauYOW(ModelArray::Type::H)
@@ -79,8 +79,8 @@ class IAtmosphereBoundary : public ModelComponent {
7979
HField snow;
8080
HField rain;
8181
HField evap;
82-
UField uwind;
83-
VField vwind;
82+
HField uwind;
83+
HField vwind;
8484
HField penSW;
8585
HField tauXOW; // x(east)-ward open ocean stress, Pa
8686
HField tauYOW; // y(north)-ward open ocean stress, Pa

‎physics/src/modules/include/IOceanBoundary.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ class IOceanBoundary : public ModelComponent {
165165
HField mld; // Mixed layer or slab ocean depth m
166166
HField tf; // Freezing point of the mixed layer, ˚C
167167
HField cpml; // Heat capacity of the mixed layer, J K⁻¹ m²
168-
UField u; // x(east)-ward ocean current, m s⁻¹
169-
VField v; // y(north)-ward ocean current, m s⁻¹
168+
HField u; // x(east)-ward ocean current, m s⁻¹
169+
HField v; // y(north)-ward ocean current, m s⁻¹
170170
HField ssh; // sea surface height, m
171171
HField qNoSun; // Net surface ocean heat flux, except short wave, W m⁻²
172172
HField qswNet; // Net surface ocean shortwave flux, W m⁻²

‎physics/test/BenchmarkBoundaries_test.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ TEST_CASE("OceanTest")
2020
const size_t nx = 256;
2121
const size_t ny = 256;
2222
ModelArray::setDimensions(ModelArray::Type::H, { nx, ny });
23-
ModelArray::setDimensions(ModelArray::Type::U, { nx, ny });
24-
ModelArray::setDimensions(ModelArray::Type::V, { nx, ny });
2523

2624
BenchmarkOcean benchOcean;
2725
benchOcean.setData(ModelState::DataMap());
@@ -48,8 +46,6 @@ TEST_CASE("AtmosphereTest")
4846
const size_t nx = 256;
4947
const size_t ny = 256;
5048
ModelArray::setDimensions(ModelArray::Type::H, { nx, ny });
51-
ModelArray::setDimensions(ModelArray::Type::U, { nx, ny });
52-
ModelArray::setDimensions(ModelArray::Type::V, { nx, ny });
5349

5450
BenchmarkAtmosphere benchAtm;
5551
benchAtm.setData(ModelState::DataMap());

0 commit comments

Comments
 (0)