update fdb

spack-env/spack.yaml

@@ -4,10 +4,10 @@
 # configuration settings.
 spack:
  specs:
- - fdb
- - eckit@1.20.2 ~mpi
- - eccodes@2.25 jp2k=none
- - hdf5 ~mpi
+ - fdb@=5.11.116 +tools
+ - eckit@=1.26.2 ~mpi
+ - eccodes@=2.33.0 jp2k=none
+ - metkit@=1.11.9
  view: true
  concretizer:
  unify: true

src/meteodatalab/mars.py

@@ -155,12 +155,12 @@ def to_fdb(self) -> dict[str, typing.Any]:
 
  obj = dc.replace(self, levelist=levelist)
  out = typing.cast(dict[str, typing.Any], obj.dump())
- return out | {"param": self._param_id()}
+ return out | {"param": self._param_id(), "model": out["model"].lower()}
 
  def to_polytope(self) -> dict[str, typing.Any]:
  result = self.to_fdb()
  if isinstance(result["param"], list):
  param: str | list[str] = [str(p) for p in result["param"]]
  else:
  param = str(result["param"])
- return result | {"param": param, "model": result["model"].lower()}
+ return result | {"param": param}

tests/test_meteodatalab/test_mars.py

@@ -14,7 +14,7 @@ def sample():
  "expver": "0001",
  "levtype": "ml",
  "levelist": list(range(1, 81)),
- "model": "COSMO-1E",
+ "model": "cosmo-1e",
  "number": 0,
  "stream": "enfo",
  "param": 500028, # U
@@ -46,7 +46,7 @@ def test_fdb_c2e(sample):
  step=0,
  model=mars.Model.COSMO_2E,
  ).to_fdb()
- expected = sample | {"model": "COSMO-2E", "levelist": list(range(1, 61))}
+ expected = sample | {"model": "cosmo-2e", "levelist": list(range(1, 61))}
 
  assert observed == expected