Skip to content

Commit 5c12dd3

Browse files
frldfrld
committed
Merge branch 'develop' into feature/bump_covariance
2 parents c4f788b + 343dd1b commit 5c12dd3

13 files changed

+18
-18
lines changed

‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
workflow_dispatch:
99
env:
1010
REGISTRY: ghcr.io
11-
IMAGE_NAME: twsearle/orca-jedi/ci-almalinux9:v1.4.0
11+
IMAGE_NAME: twsearle/orca-jedi/ci-almalinux9:v1.5.0
1212
jobs:
1313
build:
1414
runs-on: ubuntu-latest

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.4.0
1+
1.5.0

‎ci/hpccm_recipe_almalinux9.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def gitlab_url(repo, vn):
2121

2222
# get versions via --userarg options
2323
# build hdf5/netcdf with zstd (libzstd from epel)
24-
atlas_orca_vn = USERARG.get('atlas_orca_vn', '0.3.1')
24+
atlas_orca_vn = USERARG.get('atlas_orca_vn', '0.4.0')
2525
atlas_vn = USERARG.get('atlas_vn', '0.38.1')
2626
blitz_vn = USERARG.get('blitz_vn', '1.0.2')
2727
boost_vn = USERARG.get('boost_vn', '1.85.0')

‎src/mains/orcamodel3DVar.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ int main(int argc, char ** argv) {
2727
saber::instantiateCovarFactory<orcamodel::OrcaModelTraits>();
2828
ufo::instantiateObsFilterFactory();
2929
#if defined(NEMO_FEEDBACK_EXISTS)
30-
nemo_feedback::instantiateObsFilterFactory<ufo::ObsTraits>();
30+
nemo_feedback::instantiateObsFilterFactory();
3131
#endif
3232
oops::Variational<orcamodel::OrcaModelTraits , ufo::ObsTraits> var;
3333
int i = run.execute(var);

‎src/mains/orcamodelHofX.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ int main(int argc, char ** argv) {
2222
atlas::Library::instance().initialise();
2323
ufo::instantiateObsFilterFactory();
2424
#if defined(NEMO_FEEDBACK_EXISTS)
25-
nemo_feedback::instantiateObsFilterFactory<ufo::ObsTraits>();
25+
nemo_feedback::instantiateObsFilterFactory();
2626
#endif
2727
oops::HofX4D<orcamodel::OrcaModelTraits , ufo::ObsTraits> hofx;
2828
int i = run.execute(hofx);

‎src/mains/orcamodelHofX3D.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ int main(int argc, char ** argv) {
2222
atlas::Library::instance().initialise();
2323
ufo::instantiateObsFilterFactory();
2424
#if defined(NEMO_FEEDBACK_EXISTS)
25-
nemo_feedback::instantiateObsFilterFactory<ufo::ObsTraits>();
25+
nemo_feedback::instantiateObsFilterFactory();
2626
#endif
2727
oops::HofX3D<orcamodel::OrcaModelTraits , ufo::ObsTraits> hofx;
2828
int i = run.execute(hofx);

‎src/tests/testoutput/test_dirac.ref

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Input Dirac increment:Increment valid at time: 2021-06-30T12:00:00Z
22
1 variables: ice_area_fraction
33
atlas field:
4-
ice_area_fraction num: 26553 mean: 3.76605e-05 rms: 6.13682e-03 min: 0.00000e+00 max: 1.00000e+00
4+
ice_area_fraction num: 26551 mean: 3.76634e-05 rms: 6.13705e-03 min: 0.00000e+00 max: 1.00000e+00
55

66
Independent levels: 1[1]
77
Subset Sc0 size: 26460

‎src/tests/testoutput/test_hofx3d_nc_potm.ref

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Test : Model state valid at time: 2021-06-30T00:00:00Z
33
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
6-
Test : sea_water_potential_temperature_background_error: 3.54309e-04
7-
Test : depth: 2.05581e-01
6+
Test : sea_water_potential_temperature_background_error: 3.54323e-04
7+
Test : depth: 2.05589e-01
88

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

‎src/tests/testoutput/test_hofx3d_nc_prof_2vars.ref

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ Test : Model state valid at time: 2021-06-30T00:00:00Z
33
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
6-
Test : sea_water_potential_temperature_background_error: 3.54309e-04
7-
Test : depth: 2.05581e-01
6+
Test : sea_water_potential_temperature_background_error: 3.54323e-04
7+
Test : depth: 2.05589e-01
88
Test : salinity: 1.89413e-01
9-
Test : salinity_background_error: 3.54309e-04
9+
Test : salinity_background_error: 3.54323e-04
1010

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

‎src/tests/testoutput/test_hofx3d_nc_sic.ref

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ 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
6-
Test : ice_area_fraction_background_error: 3.06841e-03
6+
Test : ice_area_fraction_background_error: 3.06852e-03
77

88
Test : H(x):
99
Test : Sea Ice nobs= 4 Min=0, Max=0, RMS=0

‎src/tests/testoutput/test_hofx3d_nc_sst.ref

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ 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
6-
Test : sea_surface_temperature_background_error: 6.13682e-04
6+
Test : sea_surface_temperature_background_error: 6.13705e-04
77

88
Test : H(x):
99

‎src/tests/testoutput/test_hofx_nc_sic.ref

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ 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
6-
Test : ice_area_fraction_background_error: 3.06841e-03
6+
Test : ice_area_fraction_background_error: 3.06852e-03
77

88
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
13-
Test : ice_area_fraction_background_error: 3.06841e-03
13+
Test : ice_area_fraction_background_error: 3.06852e-03
1414

1515
Test : H(x):
1616
Test : Sea Ice nobs= 7 Min=0.00000e+00, Max=5.41667e-01, RMS=2.04731e-01

‎src/tests/testoutput/test_hofx_nc_sst.ref

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ 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
6-
Test : sea_surface_temperature_background_error: 6.13682e-04
6+
Test : sea_surface_temperature_background_error: 6.13705e-04
77

88
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
13-
Test : sea_surface_temperature_background_error: 6.13682e-04
13+
Test : sea_surface_temperature_background_error: 6.13705e-04
1414

1515
Test : H(x):
1616

0 commit comments

Comments
 (0)