Skip to content

Commit 122ac08

Browse files
timspainNERSCtimspainNERSC
committed
Remove the U ModelArray type.
1 parent 0a1c9e1 commit 122ac08

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
@@ -67,12 +67,9 @@ ModelArray ModelComponent::mask(const ModelArray& data)
6767
break;
6868
}
6969
case (ModelArray::Type::H):
70-
case (ModelArray::Type::U):
71-
case (ModelArray::Type::V): {
7270
return data * oceanMask() + MissingData::value() * (1 - oceanMask());
7371
break;
7472
}
75-
}
7673
}
7774

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

‎core/src/RectGridIO.cpp‎

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

8282
#ifdef USE_MPI
83-
// Get the sizes of the four types of field
84-
// HField from hice
83+
// Get the sizes of the HField from hice
8584
dimensionSetter(dataGroup, hiceName, ModelArray::Type::H, metadata);
86-
// UField from hice
87-
dimensionSetter(dataGroup, hiceName, ModelArray::Type::U, metadata);
88-
// VField from hice
89-
dimensionSetter(dataGroup, hiceName, ModelArray::Type::V, metadata);
9085
#else
91-
// Get the sizes of the four types of field
92-
// HField from hice
86+
// Get the sizes of the HField from hice
9387
dimensionSetter(dataGroup, hiceName, ModelArray::Type::H);
94-
// UField from hice
95-
dimensionSetter(dataGroup, hiceName, ModelArray::Type::U);
96-
// VField from hice
97-
dimensionSetter(dataGroup, hiceName, ModelArray::Type::V);
9888
#endif
9989

10090
#ifdef USE_MPI

‎core/src/discontinuousgalerkin/ModelArrayDetails.cpp‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,6 @@ ModelArray::TypeDimensions ModelArray::typeDimensions = {
5353
ModelArray::Dimension::XVERTEX,
5454
ModelArray::Dimension::YVERTEX,
5555
} },
56-
{ ModelArray::Type::U,
57-
{
58-
ModelArray::Dimension::X,
59-
ModelArray::Dimension::Y,
60-
} },
61-
{ ModelArray::Type::V,
62-
{
63-
ModelArray::Dimension::X,
64-
ModelArray::Dimension::Y,
65-
} },
6656
{ ModelArray::Type::DG,
6757
{
6858
ModelArray::Dimension::X,
@@ -83,8 +73,6 @@ ModelArray::TypeDimensions ModelArray::typeDimensions = {
8373
const std::map<ModelArray::Type, std::string> ModelArray::typeNames = {
8474
{ ModelArray::Type::H, "HField" },
8575
{ ModelArray::Type::VERTEX, "VertexField" },
86-
{ ModelArray::Type::U, "UField" },
87-
{ ModelArray::Type::V, "VField" },
8876
{ ModelArray::Type::DG, "DGField" },
8977
{ ModelArray::Type::DGSTRESS, "DGStressField" },
9078
{ ModelArray::Type::CG, "CGField" },
@@ -101,17 +89,15 @@ bool ModelArray::hasDoF(const Type type)
10189
}
10290

10391
ModelArray::SizeMap::SizeMap()
104-
: m_sizes({ { Type::H, 0 }, { Type::VERTEX, 1 }, { Type::U, 0 }, { Type::V, 0 },
105-
{ Type::DG, 0 }, { Type::DGSTRESS, 0 }, { Type::CG, 1 } })
92+
: m_sizes( { { Type::H, 0 }, { Type::VERTEX, 1 }, { Type::DG, 0 }, { Type::DGSTRESS, 0 }, {
93+
Type::CG, 1 } })
10694
{
10795
}
10896

10997
ModelArray::DimensionMap::DimensionMap()
11098
: m_dimensions({
11199
{ Type::H, { 0, 0 } },
112100
{ Type::VERTEX, { 1, 1 } },
113-
{ Type::U, { 0, 0 } },
114-
{ Type::V, { 0, 0 } },
115101
{ Type::DG, { 0, 0 } },
116102
{ Type::DGSTRESS, { 0, 0 } },
117103
{ Type::CG, { 1, 1 } },

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ enum class Dimension { X, Y, XVERTEX, YVERTEX, XCG, YCG, DG, DGSTRESS, NCOORDS,
1919
enum class Type {
2020
H,
2121
VERTEX,
22-
U,
23-
V,
2422
DG,
2523
DGSTRESS,
2624
CG,
@@ -30,8 +28,6 @@ static const Type AdvectionType = Type::DG;
3028

3129
static ModelArray HField() { return ModelArray(Type::H); }
3230
static ModelArray VertexField() { return ModelArray(Type::VERTEX); }
33-
static ModelArray UField() { return ModelArray(Type::U); }
34-
static ModelArray VField() { return ModelArray(Type::V); }
3531
static ModelArray DGField() { return ModelArray(Type::DG); }
3632
static ModelArray DGSField() { return ModelArray(Type::DGSTRESS); }
3733
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
@@ -12,8 +12,6 @@
1212

1313
typedef ModelArray HField;
1414
typedef ModelArray VertexField;
15-
typedef ModelArray UField;
16-
typedef ModelArray VField;
1715
typedef ModelArray DGField;
1816
typedef ModelArray DGSField;
1917
typedef ModelArray CGField;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,4 @@
1111
// ModelArrayDetails.cpp
1212

1313
typedef ModelArray HField;
14-
typedef ModelArray UField;
15-
typedef ModelArray VField;
1614
typedef ModelArray VertexField;

‎dynamics/src/CGDynamicsKernel.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,22 +88,22 @@ template <int DGadvection>
8888
ModelArray CGDynamicsKernel<DGadvection>::getDG0Data(const std::string& name) const
8989
{
9090
if (name == uName) {
91-
ModelArray data(ModelArray::Type::U);
91+
ModelArray data(ModelArray::Type::H);
9292
DGVector<DGadvection> utmp(*smesh);
9393
Nextsim::Interpolations::CG2DG(*smesh, utmp, u);
9494
return DGModelArray::dg2ma(utmp, data);
9595
} else if (name == vName) {
96-
ModelArray data(ModelArray::Type::V);
96+
ModelArray data(ModelArray::Type::H);
9797
DGVector<DGadvection> vtmp(*smesh);
9898
Nextsim::Interpolations::CG2DG(*smesh, vtmp, v);
9999
return DGModelArray::dg2ma(vtmp, data);
100100
} else if (name == uIOStressName) {
101-
ModelArray data(ModelArray::Type::U);
101+
ModelArray data(ModelArray::Type::H);
102102
DGVector<DGadvection> utmp(*smesh);
103103
Nextsim::Interpolations::CG2DG(*smesh, utmp, uIceOceanStress);
104104
return DGModelArray::dg2ma(utmp, data);
105105
} else if (name == vIOStressName) {
106-
ModelArray data(ModelArray::Type::V);
106+
ModelArray data(ModelArray::Type::H);
107107
DGVector<DGadvection> vtmp(*smesh);
108108
Nextsim::Interpolations::CG2DG(*smesh, vtmp, vIceOceanStress);
109109
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
@@ -25,8 +25,8 @@ class IAtmosphereBoundary : public ModelComponent {
2525
, snow(ModelArray::Type::H)
2626
, rain(ModelArray::Type::H)
2727
, evap(ModelArray::Type::H)
28-
, uwind(ModelArray::Type::U)
29-
, vwind(ModelArray::Type::V)
28+
, uwind(ModelArray::Type::H)
29+
, vwind(ModelArray::Type::H)
3030
, penSW(ModelArray::Type::H)
3131
, tauXOW(ModelArray::Type::H)
3232
, tauYOW(ModelArray::Type::H)
@@ -81,8 +81,8 @@ class IAtmosphereBoundary : public ModelComponent {
8181
HField snow;
8282
HField rain;
8383
HField evap;
84-
UField uwind;
85-
VField vwind;
84+
HField uwind;
85+
HField vwind;
8686
HField penSW;
8787
HField tauXOW; // x(east)-ward open ocean stress, Pa
8888
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
@@ -167,8 +167,8 @@ class IOceanBoundary : public ModelComponent {
167167
HField mld; // Mixed layer or slab ocean depth m
168168
HField tf; // Freezing point of the mixed layer, ˚C
169169
HField cpml; // Heat capacity of the mixed layer, J K⁻¹ m²
170-
UField u; // x(east)-ward ocean current, m s⁻¹
171-
VField v; // y(north)-ward ocean current, m s⁻¹
170+
HField u; // x(east)-ward ocean current, m s⁻¹
171+
HField v; // y(north)-ward ocean current, m s⁻¹
172172
HField ssh; // sea surface height, m
173173
HField qNoSun; // Net surface ocean heat flux, except short wave, W m⁻²
174174
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
@@ -23,8 +23,6 @@ TEST_CASE("OceanTest")
2323
const size_t nx = 256;
2424
const size_t ny = 256;
2525
ModelArray::setDimensions(ModelArray::Type::H, { nx, ny });
26-
ModelArray::setDimensions(ModelArray::Type::U, { nx, ny });
27-
ModelArray::setDimensions(ModelArray::Type::V, { nx, ny });
2826

2927
BenchmarkOcean benchOcean;
3028
benchOcean.setData(ModelState::DataMap());
@@ -51,8 +49,6 @@ TEST_CASE("AtmosphereTest")
5149
const size_t nx = 256;
5250
const size_t ny = 256;
5351
ModelArray::setDimensions(ModelArray::Type::H, { nx, ny });
54-
ModelArray::setDimensions(ModelArray::Type::U, { nx, ny });
55-
ModelArray::setDimensions(ModelArray::Type::V, { nx, ny });
5652

5753
BenchmarkAtmosphere benchAtm;
5854
benchAtm.setData(ModelState::DataMap());

0 commit comments

Comments
 (0)