diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e261dfc..787bcc5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: workflow_dispatch: env: REGISTRY: ghcr.io - IMAGE_NAME: twsearle/orca-jedi/ci-almalinux9:v1.4.0 + IMAGE_NAME: twsearle/orca-jedi/ci-almalinux9:v1.5.0 jobs: build: runs-on: ubuntu-latest diff --git a/VERSION b/VERSION index 88c5fb8..bc80560 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.0 +1.5.0 diff --git a/ci/hpccm_recipe_almalinux9.py b/ci/hpccm_recipe_almalinux9.py index 18925ca..dc7ff1d 100644 --- a/ci/hpccm_recipe_almalinux9.py +++ b/ci/hpccm_recipe_almalinux9.py @@ -21,7 +21,7 @@ def gitlab_url(repo, vn): # get versions via --userarg options # build hdf5/netcdf with zstd (libzstd from epel) -atlas_orca_vn = USERARG.get('atlas_orca_vn', '0.3.1') +atlas_orca_vn = USERARG.get('atlas_orca_vn', '0.4.0') atlas_vn = USERARG.get('atlas_vn', '0.38.1') blitz_vn = USERARG.get('blitz_vn', '1.0.2') boost_vn = USERARG.get('boost_vn', '1.85.0') diff --git a/src/mains/orcamodel3DVar.cc b/src/mains/orcamodel3DVar.cc index 9249cc6..6086fe6 100644 --- a/src/mains/orcamodel3DVar.cc +++ b/src/mains/orcamodel3DVar.cc @@ -27,7 +27,7 @@ int main(int argc, char ** argv) { saber::instantiateCovarFactory(); ufo::instantiateObsFilterFactory(); #if defined(NEMO_FEEDBACK_EXISTS) - nemo_feedback::instantiateObsFilterFactory(); + nemo_feedback::instantiateObsFilterFactory(); #endif oops::Variational var; int i = run.execute(var); diff --git a/src/mains/orcamodelHofX.cc b/src/mains/orcamodelHofX.cc index c5fd5ca..b774686 100644 --- a/src/mains/orcamodelHofX.cc +++ b/src/mains/orcamodelHofX.cc @@ -22,7 +22,7 @@ int main(int argc, char ** argv) { atlas::Library::instance().initialise(); ufo::instantiateObsFilterFactory(); #if defined(NEMO_FEEDBACK_EXISTS) - nemo_feedback::instantiateObsFilterFactory(); + nemo_feedback::instantiateObsFilterFactory(); #endif oops::HofX4D hofx; int i = run.execute(hofx); diff --git a/src/mains/orcamodelHofX3D.cc b/src/mains/orcamodelHofX3D.cc index 6f73c42..561266c 100644 --- a/src/mains/orcamodelHofX3D.cc +++ b/src/mains/orcamodelHofX3D.cc @@ -22,7 +22,7 @@ int main(int argc, char ** argv) { atlas::Library::instance().initialise(); ufo::instantiateObsFilterFactory(); #if defined(NEMO_FEEDBACK_EXISTS) - nemo_feedback::instantiateObsFilterFactory(); + nemo_feedback::instantiateObsFilterFactory(); #endif oops::HofX3D hofx; int i = run.execute(hofx); diff --git a/src/tests/testoutput/test_dirac.ref b/src/tests/testoutput/test_dirac.ref index 411f6d5..7e10164 100644 --- a/src/tests/testoutput/test_dirac.ref +++ b/src/tests/testoutput/test_dirac.ref @@ -1,7 +1,7 @@ Input Dirac increment:Increment valid at time: 2021-06-30T12:00:00Z 1 variables: ice_area_fraction atlas field: - ice_area_fraction num: 26553 mean: 3.76605e-05 rms: 6.13682e-03 min: 0.00000e+00 max: 1.00000e+00 + ice_area_fraction num: 26551 mean: 3.76634e-05 rms: 6.13705e-03 min: 0.00000e+00 max: 1.00000e+00 Independent levels: 1[1] Subset Sc0 size: 26460 diff --git a/src/tests/testoutput/test_hofx3d_nc_potm.ref b/src/tests/testoutput/test_hofx3d_nc_potm.ref index f21949d..8016549 100644 --- a/src/tests/testoutput/test_hofx3d_nc_potm.ref +++ b/src/tests/testoutput/test_hofx3d_nc_potm.ref @@ -3,8 +3,8 @@ Test : Model state valid at time: 2021-06-30T00:00:00Z Test : 3 variables: sea_water_potential_temperature, sea_water_potential_temperature_background_error, depth Test : atlas field norms: Test : sea_water_potential_temperature: 9.73262e-02 -Test : sea_water_potential_temperature_background_error: 3.54309e-04 -Test : depth: 2.05581e-01 +Test : sea_water_potential_temperature_background_error: 3.54323e-04 +Test : depth: 2.05589e-01 Test : H(x): Test : Sea Temperature nobs= 6 Min=1.80417e+01, Max=1.81944e+01, RMS=1.81181e+01 diff --git a/src/tests/testoutput/test_hofx3d_nc_prof_2vars.ref b/src/tests/testoutput/test_hofx3d_nc_prof_2vars.ref index ee2c360..5f658a4 100644 --- a/src/tests/testoutput/test_hofx3d_nc_prof_2vars.ref +++ b/src/tests/testoutput/test_hofx3d_nc_prof_2vars.ref @@ -3,10 +3,10 @@ Test : Model state valid at time: 2021-06-30T00:00:00Z Test : 5 variables: sea_water_potential_temperature, sea_water_potential_temperature_background_error, depth, salinity, salinity_background_error Test : atlas field norms: Test : sea_water_potential_temperature: 9.73262e-02 -Test : sea_water_potential_temperature_background_error: 3.54309e-04 -Test : depth: 2.05581e-01 +Test : sea_water_potential_temperature_background_error: 3.54323e-04 +Test : depth: 2.05589e-01 Test : salinity: 1.89413e-01 -Test : salinity_background_error: 3.54309e-04 +Test : salinity_background_error: 3.54323e-04 Test : H(x): Test : ARGO profiles nobs= 12 Min=1.81028e+01, Max=3.52000e+01, RMS=2.79784e+01 diff --git a/src/tests/testoutput/test_hofx3d_nc_sic.ref b/src/tests/testoutput/test_hofx3d_nc_sic.ref index 7a77fb0..9899aa1 100644 --- a/src/tests/testoutput/test_hofx3d_nc_sic.ref +++ b/src/tests/testoutput/test_hofx3d_nc_sic.ref @@ -3,7 +3,7 @@ Test : Model state valid at time: 2021-06-30T00:00:00Z Test : 2 variables: ice_area_fraction, ice_area_fraction_background_error Test : atlas field norms: Test : ice_area_fraction: 3.20183e-03 -Test : ice_area_fraction_background_error: 3.06841e-03 +Test : ice_area_fraction_background_error: 3.06852e-03 Test : H(x): Test : Sea Ice nobs= 4 Min=0, Max=0, RMS=0 diff --git a/src/tests/testoutput/test_hofx3d_nc_sst.ref b/src/tests/testoutput/test_hofx3d_nc_sst.ref index cad5db8..7cc7955 100644 --- a/src/tests/testoutput/test_hofx3d_nc_sst.ref +++ b/src/tests/testoutput/test_hofx3d_nc_sst.ref @@ -3,7 +3,7 @@ Test : Model state valid at time: 2021-06-30T00:00:00Z Test : 2 variables: sea_surface_temperature, sea_surface_temperature_background_error Test : atlas field norms: Test : sea_surface_temperature: 1.37607e-01 -Test : sea_surface_temperature_background_error: 6.13682e-04 +Test : sea_surface_temperature_background_error: 6.13705e-04 Test : H(x): diff --git a/src/tests/testoutput/test_hofx_nc_sic.ref b/src/tests/testoutput/test_hofx_nc_sic.ref index 95ab077..8e0a1c7 100644 --- a/src/tests/testoutput/test_hofx_nc_sic.ref +++ b/src/tests/testoutput/test_hofx_nc_sic.ref @@ -3,14 +3,14 @@ Test : Model state valid at time: 2021-06-28T23:00:00Z Test : 2 variables: ice_area_fraction, ice_area_fraction_background_error Test : atlas field norms: Test : ice_area_fraction: 0.00000e+00 -Test : ice_area_fraction_background_error: 3.06841e-03 +Test : ice_area_fraction_background_error: 3.06852e-03 Test : Final state: Test : Model state valid at time: 2021-06-30T23:00:00Z Test : 2 variables: ice_area_fraction, ice_area_fraction_background_error Test : atlas field norms: Test : ice_area_fraction: 3.16981e-03 -Test : ice_area_fraction_background_error: 3.06841e-03 +Test : ice_area_fraction_background_error: 3.06852e-03 Test : H(x): Test : Sea Ice nobs= 7 Min=0.00000e+00, Max=5.41667e-01, RMS=2.04731e-01 diff --git a/src/tests/testoutput/test_hofx_nc_sst.ref b/src/tests/testoutput/test_hofx_nc_sst.ref index a7d9c0e..153a5ea 100644 --- a/src/tests/testoutput/test_hofx_nc_sst.ref +++ b/src/tests/testoutput/test_hofx_nc_sst.ref @@ -3,14 +3,14 @@ Test : Model state valid at time: 2021-06-28T23:00:00Z Test : 2 variables: sea_surface_temperature, sea_surface_temperature_background_error Test : atlas field norms: Test : sea_surface_temperature: 1.37673e-01 -Test : sea_surface_temperature_background_error: 6.13682e-04 +Test : sea_surface_temperature_background_error: 6.13705e-04 Test : Final state: Test : Model state valid at time: 2021-06-30T23:00:00Z Test : 2 variables: sea_surface_temperature, sea_surface_temperature_background_error Test : atlas field norms: Test : sea_surface_temperature: 1.37683e-01 -Test : sea_surface_temperature_background_error: 6.13682e-04 +Test : sea_surface_temperature_background_error: 6.13705e-04 Test : H(x):