Fixes of ocean variables in multiple CMIP6 datasets

[tomaslovato]

Description

Different CMIP6 datasets (see #1539 and #1395) require the inclusion of fixes for depth coordinates definition that are common to models from the same family.

Closes #1539 and sloppy PR #1395

Checklist

It is the responsibility of the author to make sure the pull request is ready to review. The icons indicate whether the item will be subject to the 🛠 Technical or 🧪 Scientific review.

• 🛠 This pull request has a descriptive title and labels
• 🛠 Code is written according to the code quality guidelines
• 🛠 Changes are backward compatible
• 🛠 Any changed dependencies have been added or removed correctly
• 🛠 All checks below this pull request were successful

---

[valeriupredoi]

buon giorno, Tomaso, comme stai? I am not sure I understand the cesm2 fix - why are you fixing the Omon mip variable? Indeed, the test is failing since the fix has two members: cesm2.Fgco2 and cesm2.Omon:

fix = [<esmvalcore.cmor._fixes.cmip6.cesm2.Fgco2 object at 0x7f8d8d85f820>, <esmvalcore.cmor._fixes.cmip6.cesm2.Omon object at 0x7f8d8d85f7c0>]

[tomaslovato]

buon giorno, Tomaso, comme stai? I am not sure I understand the cesm2 fix - why are you fixing the Omon mip variable? Indeed, the test is failing since the fix has two members: cesm2.Fgco2 and cesm2.Omon:

fix = [<esmvalcore.cmor._fixes.cmip6.cesm2.Fgco2 object at 0x7f8d8d85f820>, <esmvalcore.cmor._fixes.cmip6.cesm2.Omon object at 0x7f8d8d85f7c0>]

Grandissimo @valeriupredoi !!! tutto bbbene!
I think this one in on me ... I forgot to add Omon in the test_get_fgco2_fix script of cesm2_waccm, similarly to what it is done for cesm2,

ESMValCore/tests/integration/cmor/_fixes/cmip6/test_cesm2.py

Lines 284 to 287 in 4241457

	def test_get_fgco2_fix():
	"""Test getting of fix."""
	fix = Fix.get_fixes('CMIP6', 'CESM2', 'Omon', 'fgco2')
	assert fix == [Fgco2(None), Omon(None)]

[codecov]

Codecov Report

Merging #1566 (733d53c) into main (457cdf5) will increase coverage by 0.02%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main    #1566      +/-   ##
==========================================
+ Coverage   90.76%   90.79%   +0.02%     
==========================================
  Files         197      199       +2     
  Lines       10572    10598      +26     
==========================================
+ Hits         9596     9622      +26     
  Misses        976      976              

Impacted Files	Coverage Δ
esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py	100.00% <100.00%> (ø)
esmvalcore/cmor/_fixes/cmip6/cesm2_fv2.py	100.00% <100.00%> (ø)
esmvalcore/cmor/_fixes/cmip6/cesm2_waccm.py	100.00% <100.00%> (ø)
esmvalcore/cmor/_fixes/cmip6/cesm2_waccm_fv2.py	100.00% <100.00%> (ø)
esmvalcore/cmor/_fixes/cmip6/cnrm_cm6_1.py	100.00% <100.00%> (ø)
esmvalcore/cmor/_fixes/cmip6/cnrm_esm2_1.py	100.00% <100.00%> (ø)
esmvalcore/cmor/_fixes/cmip6/fgoals_f3_l.py	87.50% <100.00%> (+0.54%)	⬆️
esmvalcore/cmor/_fixes/cmip6/gfdl_cm4.py	66.66% <100.00%> (+5.37%)	⬆️
esmvalcore/cmor/_fixes/cmip6/gfdl_esm4.py	100.00% <100.00%> (ø)
esmvalcore/cmor/_fixes/cmip6/ipsl_cm5a2_inca.py	100.00% <100.00%> (ø)
... and 1 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 457cdf5...733d53c. Read the comment docs.

[tomaslovato]

I included fixes for the following models:
cesm2_fv2, cesm2_waccm, cesm2_waccm_fv2, cnrm_cm6_1, fgoals_f3_l,
gfdl_cm4, gfdl_esm4, ipsl_cm5a2_inca, ipsl_cm6a_lr_inca

I did not imported from PR #1395 the fixes for

• ipsl_cm6a_inca as I did not found this dataset on ESGF.
• iitm_esm, the original data (e.g. for thetao and uo) does not require any fix to the coordinate
• noresm2_lm & noresm2_mm: the regular grid (gr) data of these dataset doesn't need fixes. If the original intent in Added ocean fixes #1395 was to fix the native grid data (gn) the proposed fixes were applied to vertical layers that are in sigma coordinate, so the simple renaming of the depth would not help with this.

[valeriupredoi]

excellent, mille grazie @tomaslovato 🍺 Could you please fix the issue description boxes too? Cheers muchly for the good work!

[tomaslovato]

excellent, mille grazie @tomaslovato 🍺 Could you please fix the issue description boxes too? Cheers muchly for the good work!

I checked the boxes at the top of this PR ... there is still something missing?

[valeriupredoi]

excellent, mille grazie @tomaslovato beer Could you please fix the issue description boxes too? Cheers muchly for the good work!

I checked the boxes at the top of this PR ... there is still something missing?

all's nice and ready, man, thanks a lot!