Skip to content

Commit bcf6498

Browse files
committed
Add fill-value CTests
1 parent e137337 commit bcf6498

3 files changed

Lines changed: 282 additions & 19 deletions

File tree

components/omega/test/CMakeLists.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,17 @@ add_omega_test(
495495
"-n;8"
496496
)
497497

498+
##################
499+
# Fill Value test
500+
##################
501+
502+
add_omega_test(
503+
FILL_VALUE_TEST
504+
testFillValue.exe
505+
ocn/FillValueTest.cpp
506+
"-n;8"
507+
)
508+
498509
##########################
499510
# Vert Mix test
500511
##########################

components/omega/test/infra/FieldTest.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -158,44 +158,44 @@ void initFieldTest() {
158158
DimNames[0] = "NCells";
159159
auto Test1DI4H =
160160
Field::create("Test1DI4H", "Test 1DI4 field on host", "Units1DI4H",
161-
"var_name_1DI4", 0, 100000, 999, 1, DimNames);
161+
"var_name_1DI4", 0, 100000, 1, DimNames);
162162

163163
DimNames[0] = "NEdges";
164164
auto Test1DI8H =
165165
Field::create("Test1DI8H", "Test 1DI8 field on host", "Units1DI8H",
166-
"var_name_1DI8", 0, 100000, 999, 1, DimNames);
166+
"var_name_1DI8", 0, 100000, 1, DimNames);
167167

168168
DimNames[0] = "NVertices";
169169
auto Test1DR4H =
170170
Field::create("Test1DR4H", "Test 1DR4 field on host", "Units1DR4H",
171-
"var_name_1DR4", 0.0, 100000.0, 999, 1, DimNames);
171+
"var_name_1DR4", 0.0, 100000.0, 1, DimNames);
172172

173173
DimNames[0] = "NVertLayers";
174174
auto Test1DR8H =
175175
Field::create("Test1DR8H", "Test 1DR8 field on host", "Units1DR8H",
176-
"var_name_1DR8", 0.0, 100000.0, 999, 1, DimNames);
176+
"var_name_1DR8", 0.0, 100000.0, 1, DimNames);
177177

178178
// 1D Fields on device
179179

180180
DimNames[0] = "NCells";
181181
auto Test1DI4 =
182182
Field::create("Test1DI4", "Test 1DI4 field on device", "Units1DI4",
183-
"var_name_1DI4", 0, 100000, 999, 1, DimNames);
183+
"var_name_1DI4", 0, 100000, 1, DimNames);
184184

185185
DimNames[0] = "NEdges";
186186
auto Test1DI8 =
187187
Field::create("Test1DI8", "Test 1DI8 field on device", "Units1DI8",
188-
"var_name_1DI8", 0, 100000, 999, 1, DimNames);
188+
"var_name_1DI8", 0, 100000, 1, DimNames);
189189

190190
DimNames[0] = "NVertices";
191191
auto Test1DR4 =
192192
Field::create("Test1DR4", "Test 1DR4 field on device", "Units1DR4",
193-
"var_name_1DR4", 0.0, 100000.0, 999, 1, DimNames);
193+
"var_name_1DR4", 0.0, 100000.0, 1, DimNames);
194194

195195
DimNames[0] = "NVertLayers";
196196
auto Test1DR8 =
197197
Field::create("Test1DR8", "Test 1DR8 field on device", "Units1DR8",
198-
"var_name_1DR8", 0.0, 100000.0, 999, 1, DimNames);
198+
"var_name_1DR8", 0.0, 100000.0, 1, DimNames);
199199

200200
// 2D Fields on host
201201
DimNames.resize(2);
@@ -204,51 +204,51 @@ void initFieldTest() {
204204
DimNames[1] = "NVertLayers";
205205
auto Test2DI4H =
206206
Field::create("Test2DI4H", "Test 2DI4 field on host", "Units2DI4H",
207-
"var_name_2DI4", 0, 100000, 999, 2, DimNames);
207+
"var_name_2DI4", 0, 100000, 2, DimNames);
208208

209209
DimNames[0] = "NEdges";
210210
DimNames[1] = "NVertLayers";
211211
auto Test2DI8H =
212212
Field::create("Test2DI8H", "Test 2DI8 field on host", "Units2DI8H",
213-
"var_name_2DI8", 0, 100000, 999, 2, DimNames);
213+
"var_name_2DI8", 0, 100000, 2, DimNames);
214214

215215
DimNames[0] = "NVertices";
216216
DimNames[1] = "NVertLayers";
217217
auto Test2DR4H =
218218
Field::create("Test2DR4H", "Test 2DR4 field on host", "Units2DR4H",
219-
"var_name_2DR4", 0.0, 100000.0, 999, 2, DimNames);
219+
"var_name_2DR4", 0.0, 100000.0, 2, DimNames);
220220

221221
DimNames[0] = "NCells";
222222
DimNames[1] = "NVertLayers";
223223
auto Test2DR8H =
224224
Field::create("Test2DR8H", "Test 2DR8 field on host", "Units2DR8H",
225-
"var_name_2DR8", 0.0, 100000.0, 999, 2, DimNames);
225+
"var_name_2DR8", 0.0, 100000.0, 2, DimNames);
226226

227227
// 2D Fields on device
228228

229229
DimNames[0] = "NCells";
230230
DimNames[1] = "NVertLayers";
231231
auto Test2DI4 =
232232
Field::create("Test2DI4", "Test 2DI4 field on device", "Units2DI4",
233-
"var_name_2DI4", 0, 100000, 999, 2, DimNames);
233+
"var_name_2DI4", 0, 100000, 2, DimNames);
234234

235235
DimNames[0] = "NEdges";
236236
DimNames[1] = "NVertLayers";
237237
auto Test2DI8 =
238238
Field::create("Test2DI8", "Test 2DI8 field on device", "Units2DI8",
239-
"var_name_2DI8", 0, 100000, 999, 2, DimNames);
239+
"var_name_2DI8", 0, 100000, 2, DimNames);
240240

241241
DimNames[0] = "NVertices";
242242
DimNames[1] = "NVertLayers";
243243
auto Test2DR4 =
244244
Field::create("Test2DR4", "Test 2DR4 field on device", "Units2DR4",
245-
"var_name_2DR4", 0.0, 100000.0, 999, 2, DimNames);
245+
"var_name_2DR4", 0.0, 100000.0, 2, DimNames);
246246

247247
DimNames[0] = "NEdges";
248248
DimNames[1] = "NVertLayers";
249249
auto Test2DR8 =
250250
Field::create("Test2DR8", "Test 2DR8 field on device", "Units2DR8",
251-
"var_name_2DR8", 0.0, 100000.0, 999, 2, DimNames);
251+
"var_name_2DR8", 0.0, 100000.0, 2, DimNames);
252252

253253
// Higher dimension fields on device
254254

@@ -258,7 +258,7 @@ void initFieldTest() {
258258
DimNames[2] = "NTracers";
259259
auto Test3DI4 =
260260
Field::create("Test3DI4", "Test 3DI4 field on device", "Units3DI4",
261-
"var_name_3DI4", 0, 100000, 999, 3, DimNames);
261+
"var_name_3DI4", 0, 100000, 3, DimNames);
262262

263263
DimNames.resize(4);
264264
DimNames[0] = "NCells";
@@ -267,7 +267,7 @@ void initFieldTest() {
267267
DimNames[3] = "NTime";
268268
auto Test4DI8 =
269269
Field::create("Test4DI8", "Test 4DI8 field on device", "Units4DI8",
270-
"var_name_4DI8", 0, 100000, 999, 4, DimNames);
270+
"var_name_4DI8", 0, 100000, 4, DimNames);
271271

272272
DimNames.resize(5);
273273
DimNames[0] = "NCells";
@@ -277,7 +277,7 @@ void initFieldTest() {
277277
DimNames[4] = "NStuff";
278278
auto Test5DR4 =
279279
Field::create("Test5DR4", "Test 5DR4 field on device", "Units5DR4",
280-
"var_name_5DR4", 0, 100000, 999, 5, DimNames);
280+
"var_name_5DR4", 0, 100000, 5, DimNames);
281281

282282
/// Create two field groups for 1D and 2D fields
283283
auto FieldGroup1D = FieldGroup::create("FieldGroup1D");

0 commit comments

Comments
 (0)