Skip to content

Commit 174c87f

Browse files
twsearletwsearle
committed
test changes for atlas 0.38.1
1 parent 8bffcfc commit 174c87f

14 files changed

+37
-38
lines changed

‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
branches: [develop]
88
env:
99
REGISTRY: ghcr.io
10-
IMAGE_NAME: twsearle/orca-jedi/ci-almalinux9:feature-use-personal-ghcr-container
10+
IMAGE_NAME: twsearle/orca-jedi/ci-almalinux9:v1.3.0
1111
jobs:
1212
build:
1313
runs-on: ubuntu-latest

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ecbuild_debug( " NetCDF_FEATURES: [${NetCDF_FEATURES}]" )
2727
find_package( eckit 1.18 COMPONENTS LZ4 REQUIRED )
2828
ecbuild_debug( " eckit_FEATURES : [${eckit_FEATURES}]" )
2929

30-
find_package( atlas 0.29 REQUIRED )
30+
find_package( atlas 0.38 REQUIRED )
3131
ecbuild_debug( " atlas_FEATURES: [${atlas_FEATURES}]" )
3232

3333
find_package( atlas-orca REQUIRED )

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.2.0
1+
1.3.0

‎ci/build-and-test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ ecbuild -S "${HERE}"
5555
make -j "${NPROC}"
5656

5757
env OMPI_ALLOW_RUN_AS_ROOT=1 OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1 \
58-
ATLAS_TRACE=1 ATLAS_DEBUG=1 \
58+
OOPS_TRACE=1 OOPS_DEBUG=1 \
5959
LD_LIBRARY_PATH="${HERE}/lib:${LD_LIBRARY_PATH}" \
6060
ATLAS_DATA_PATH="${HERE}/atlas-data" \
6161
ctest -j "${NPROC}" -V --output-on-failure --test-dir "./orca-jedi"

‎src/orca-jedi/geometry/Geometry.cc

+5-4
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,12 @@ Geometry::Geometry(const eckit::Configuration & config,
8787
grid_ = construct_grid_from_name(params_.gridName.value());
8888

8989
int64_t halo = params_.sourceMeshHalo.value();
90-
if ( ( (params_.partitioner.value() == "serial") || (comm.size() == 1) )
90+
std::string partitioner_name = params_.partitioner.value();
91+
if ( ( (partitioner_name == "serial") || (comm.size() == 1) )
9192
&& (halo > 0) ) {
9293
halo = 0;
93-
oops::Log::info() << "Warning: forcing halo = 0"
94+
partitioner_name = "serial";
95+
oops::Log::info() << "Warning: forcing halo = 0 and serial partitioner"
9496
<< " as settings imply all processors have all data" << std::endl;
9597
}
9698
auto meshgen_config = grid_.meshgenerator()
@@ -99,8 +101,7 @@ Geometry::Geometry(const eckit::Configuration & config,
99101
atlas::MeshGenerator meshgen(meshgen_config);
100102
log_status();
101103
auto partitioner_config = grid_.partitioner();
102-
partitioner_config.set("type",
103-
params_.partitioner.value());
104+
partitioner_config.set("type", partitioner_name);
104105
partitioner_ = atlas::grid::Partitioner(partitioner_config);
105106
log_status();
106107
mesh_ = meshgen.generate(grid_, partitioner_);

‎src/tests/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ecbuild_add_test( TARGET test_orcamodel_hofx_ssh_parallel_checkerboard
3434
ARGS testinput/hofx_nc_ssh_checkerboard.yaml
3535
COMMAND orcamodel_hofx.x )
3636

37-
# Disabled until halos are available from atlas-orca
37+
# Requires atlas-orca halos > 0 change (https://github.com/ecmwf/atlas-orca/pull/20)
3838
#ecbuild_add_test( TARGET test_orcamodel_hofx_ssh_parallel_eorca025
3939
# OMP 1
4040
# MPI 2

‎src/tests/orca-jedi/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
include_directories( ${PROJECT_SOURCE_DIR}/src )
22

3-
#target_link_libraries( meara_test_nemo_feedback NetCDF::NetCDF_CXX )
4-
53
ecbuild_add_test( TARGET test_orcajedi_nemo_io_field_reader.x
64
SOURCES test_nemo_io_field_reader.cc
75
LIBS orcamodel )

‎src/tests/orca-jedi/test_interpolator.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,13 @@ CASE("test interpolator") {
9595
oops::Variable{"sea_surface_foundation_temperature"}}};
9696
settings_map["ORCA2_T"].surf_values = std::vector<double>{
9797
1, missing_value, 0,
98-
18.4888916016, missing_value, 18.1592999503};
98+
18.4888877869, missing_value, 18.1592998505};
9999

100100
settings_map["ORCA2_T"].vol_vars = oops::Variables{
101101
{oops::Variable{"sea_water_potential_temperature"}}};
102102
settings_map["ORCA2_T"].vol_values = std::vector<double>{
103-
18.4888916016, missing_value, 18.1592999503,
104-
17.9419364929, missing_value, 17.75000288,
103+
18.4888877869, missing_value, 18.1592998505,
104+
18 , missing_value, 17.7500019073,
105105
missing_value, missing_value, missing_value};
106106
}
107107

‎src/tests/testoutput/test_hofx3d_nc_potm.ref

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
Test : State:
2-
Test : Model state valid at time: 2021-06-30T00:00:00Z
3-
Test : 3 variables: sea_water_potential_temperature, depthBelowWaterSurface, sea_water_potential_temperature_background_error
1+
Test : State:
2+
Test : Model state valid at time: 2021-06-30T00:00:00Z
3+
Test : 3 variables: sea_water_potential_temperature, sea_water_potential_temperature_background_error, depth
44
Test : atlas field norms:
55
Test : sea_water_potential_temperature: 9.73262e-02
66
Test : sea_water_potential_temperature_background_error: 3.54309e-04
7-
Test : depthBelowWaterSurface: 2.05581e-01
7+
Test : depth: 2.05581e-01
88

9-
Test : H(x):
9+
Test : H(x):
1010
Test : Sea Temperature nobs= 6 Min=1.80417e+01, Max=1.81944e+01, RMS=1.81181e+01
1111

1212
Test : End H(x)

‎src/tests/testoutput/test_hofx3d_nc_prof_2vars.ref

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
Test : State:
2-
Test : Model state valid at time: 2021-06-30T00:00:00Z
3-
Test : 5 variables: sea_water_potential_temperature, sea_water_potential_temperature_background_error, depthBelowWaterSurface, salinity, salinity_background_error
1+
Test : State:
2+
Test : Model state valid at time: 2021-06-30T00:00:00Z
3+
Test : 5 variables: sea_water_potential_temperature, sea_water_potential_temperature_background_error, depth, salinity, salinity_background_error
44
Test : atlas field norms:
55
Test : sea_water_potential_temperature: 9.73262e-02
66
Test : sea_water_potential_temperature_background_error: 3.54309e-04
7-
Test : depthBelowWaterSurface: 2.05581e-01
7+
Test : depth: 2.05581e-01
88
Test : salinity: 1.89413e-01
99
Test : salinity_background_error: 3.54309e-04
1010

11-
Test : H(x):
11+
Test : H(x):
1212
Test : ARGO profiles nobs= 12 Min=1.81028e+01, Max=3.52000e+01, RMS=2.79784e+01
1313

1414
Test : End H(x)

‎src/tests/testoutput/test_hofx3d_nc_sst.ref

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
Test : State:
1+
Test : State:
22
Test : Model state valid at time: 2021-06-30T00:00:00Z
33
Test : 2 variables: sea_surface_temperature, sea_surface_temperature_background_error
44
Test : atlas field norms:
55
Test : sea_surface_temperature: 1.37607e-01
66
Test : sea_surface_temperature_background_error: 6.13682e-04
77

8-
Test : H(x):
9-
Test : Sea Surface Temperature nobs= 7 Min=17.6445, Max=18.4389, RMS=18.0723
10-
11-
Test : End H(x)
8+
Test : H(x):
129

10+
Test : Sea Surface Temperature nobs= 7 Min=1.76445e+01, Max=1.84389e+01, RMS=1.80723e+01
1311

12+
Test : End H(x)

‎src/tests/testoutput/test_hofx_nc_ice.ref

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
Test : Initial state:
1+
Test : Initial state:
22
Test : Model state valid at time: 2021-06-28T23:00:00Z
33
Test : 2 variables: ice_area_fraction, ice_area_fraction_background_error
44
Test : atlas field norms:
55
Test : ice_area_fraction: 0.00000e+00
66
Test : ice_area_fraction_background_error: 3.06841e-03
77

8-
Test : Final state:
8+
Test : Final state:
99
Test : Model state valid at time: 2021-06-30T23:00:00Z
1010
Test : 2 variables: ice_area_fraction, ice_area_fraction_background_error
1111
Test : atlas field norms:
1212
Test : ice_area_fraction: 3.16981e-03
1313
Test : ice_area_fraction_background_error: 3.06841e-03
1414

15-
Test : H(x):
16-
Test : Sea Ice nobs= 7 Min=0.00000e+00, Max=5.41667e-01, RMS=2.04731e-01'
15+
Test : H(x):
16+
Test : Sea Ice nobs= 7 Min=0.00000e+00, Max=5.41667e-01, RMS=2.04731e-01
1717

1818
Test : End H(x)

‎src/tests/testoutput/test_hofx_nc_sst.ref

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
Test : Initial state:
1+
Test : Initial state:
22
Test : Model state valid at time: 2021-06-28T23:00:00Z
33
Test : 2 variables: sea_surface_temperature, sea_surface_temperature_background_error
44
Test : atlas field norms:
55
Test : sea_surface_temperature: 1.37673e-01
66
Test : sea_surface_temperature_background_error: 6.13682e-04
77

8-
Test : Final state:
8+
Test : Final state:
99
Test : Model state valid at time: 2021-06-30T23:00:00Z
1010
Test : 2 variables: sea_surface_temperature, sea_surface_temperature_background_error
1111
Test : atlas field norms:
1212
Test : sea_surface_temperature: 1.37683e-01
1313
Test : sea_surface_temperature_background_error: 6.13682e-04
1414

15-
Test : H(x):
15+
Test : H(x):
16+
1617
Test : Sea Surface Temperature nobs= 7 Min=1.76544e+01, Max=1.84389e+01, RMS=1.80765e+01
1718

1819
Test : End H(x)

‎src/tests/testoutput/test_ostia_seaice_obs_hofx3d.ref

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
Test : State:
1+
Test : State:
22
Test : Model state valid at time: 2021-06-30T00:00:00Z
33
Test : 2 variables: ice_area_fraction, ice_area_fraction_background_error
44
Test : atlas field norms:
55
Test : ice_area_fraction: 3.20183e-03
66
Test : ice_area_fraction_background_error: 3.06841e-03
77

8-
Test : H(x):
8+
Test : H(x):
99
Test : Sea Ice nobs= 4 Min=0, Max=0, RMS=0
1010

1111
Test : End H(x)

0 commit comments

Comments
 (0)