UKMO rename qcl and qcf (#220)

* Fresh generation of all netcdf * Rename to cloud_*_mixing_ratio_wrt_moist_air_and_condensed_water --------- Co-authored-by: Yaswant Pradhan <[email protected]> Co-authored-by: MayeulDestouches <[email protected]>
MetOffice · Aug 14, 2024 · c0852b5 · c0852b5
1 parent 639c910
commit c0852b5
Show file tree

Hide file tree

Showing 123 changed files with 52 additions and 50 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,6 +14,7 @@ concurrency:
 env:
   REPO: ${{ github.event.repository.name }}
   PR: pr-${{ github.event.number }}
+  GH_TOKEN: ${{ secrets.GH_PAT }}
 
 jobs:
   build1:
@@ -77,7 +78,7 @@ jobs:
             'jcsda/docker-gnu-openmpi-dev:latest'
 
   build2:
-    if:
+    if: |
       ( github.repository_owner == 'MetOffice' && github.event.pull_request.draft == false )
     name: clang-mpich (JCSDA)
     runs-on: ubuntu-latest
@@ -95,7 +96,7 @@ jobs:
         with:
           path: ./${{ env.PR }}/jedicmake
           repository: JCSDA-internal/jedi-cmake
-          submodules: true
+          submodules: recursive
           token: ${{ secrets.GH_PAT }}
 
       - name: Checkout oops

diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
@@ -12,6 +12,7 @@ concurrency:
 env:
   REPO: ${{ github.event.repository.name }}
   PR: pr-${{ github.event.number }}
+  GH_TOKEN: ${{ secrets.GH_PAT }}
 
 jobs:
   build1:

diff --git a/test/generate_unittest_netcdfs.py b/test/generate_unittest_netcdfs.py
diff --git a/test/testinput/001_SurfaceCxField_Orog.nc4 b/test/testinput/001_SurfaceCxField_Orog.nc4
diff --git a/test/testinput/001_UpperAirCxField_theta.nc4 b/test/testinput/001_UpperAirCxField_theta.nc4
diff --git a/test/testinput/001_VarField_pstar.nc4 b/test/testinput/001_VarField_pstar.nc4
diff --git a/test/testinput/001_VarField_pstar_stationID_integer.nc4 b/test/testinput/001_VarField_pstar_stationID_integer.nc4
diff --git a/test/testinput/002_SurfaceCxField_pstar.nc4 b/test/testinput/002_SurfaceCxField_pstar.nc4
diff --git a/test/testinput/002_UpperAirCxFieldForMultiLevelObs_relative_humidity.nc4 b/test/testinput/002_UpperAirCxFieldForMultiLevelObs_relative_humidity.nc4
diff --git a/test/testinput/002_UpperAirCxField_relative_humidity.nc4 b/test/testinput/002_UpperAirCxField_relative_humidity.nc4
diff --git a/test/testinput/002_VarField_temperature_RadarZ.nc4 b/test/testinput/002_VarField_temperature_RadarZ.nc4
diff --git a/test/testinput/002_VarField_temperature_Surface.nc4 b/test/testinput/002_VarField_temperature_Surface.nc4
diff --git a/test/testinput/003_SurfaceCxField_t2.nc4 b/test/testinput/003_SurfaceCxField_t2.nc4
diff --git a/test/testinput/003_UpperAirCxField_u.nc4 b/test/testinput/003_UpperAirCxField_u.nc4
diff --git a/test/testinput/003_VarField_rh_Sonde.nc4 b/test/testinput/003_VarField_rh_Sonde.nc4
diff --git a/test/testinput/003_VarField_rh_Surface.nc4 b/test/testinput/003_VarField_rh_Surface.nc4
diff --git a/test/testinput/004_SurfaceCxField_rh2.nc4 b/test/testinput/004_SurfaceCxField_rh2.nc4
diff --git a/test/testinput/004_UpperAirCxField_v.nc4 b/test/testinput/004_UpperAirCxField_v.nc4
diff --git a/test/testinput/004_VarField_u_ScatwindChosen.nc4 b/test/testinput/004_VarField_u_ScatwindChosen.nc4
diff --git a/test/testinput/004_VarField_u_Sonde.nc4 b/test/testinput/004_VarField_u_Sonde.nc4
diff --git a/test/testinput/004_VarField_u_Surface.nc4 b/test/testinput/004_VarField_u_Surface.nc4
diff --git a/test/testinput/005_SurfaceCxField_u10.nc4 b/test/testinput/005_SurfaceCxField_u10.nc4
diff --git a/test/testinput/005_UpperAirCxField_q.nc4 b/test/testinput/005_UpperAirCxField_q.nc4
diff --git a/test/testinput/005_VarField_v_ScatwindChosen.nc4 b/test/testinput/005_VarField_v_ScatwindChosen.nc4
diff --git a/test/testinput/005_VarField_v_Sonde.nc4 b/test/testinput/005_VarField_v_Sonde.nc4
diff --git a/test/testinput/005_VarField_v_Surface.nc4 b/test/testinput/005_VarField_v_Surface.nc4
diff --git a/test/testinput/006_SurfaceCxField_v10.nc4 b/test/testinput/006_SurfaceCxField_v10.nc4
diff --git a/test/testinput/007_VarField_tcwv.nc4 b/test/testinput/007_VarField_tcwv.nc4
diff --git a/test/testinput/008_SurfaceCxField_visibility_1p5m.nc4 b/test/testinput/008_SurfaceCxField_visibility_1p5m.nc4
diff --git a/test/testinput/008_VarField_WindSpeed.nc4 b/test/testinput/008_VarField_WindSpeed.nc4
diff --git a/test/testinput/010_VarField_britemp.nc4 b/test/testinput/010_VarField_britemp.nc4
diff --git a/test/testinput/011_UpperAirCxField_P.nc4 b/test/testinput/011_UpperAirCxField_P.nc4
diff --git a/test/testinput/011_VarField_tskin.nc4 b/test/testinput/011_VarField_tskin.nc4
diff --git a/test/testinput/012_VarField_gpstzdelay.nc4 b/test/testinput/012_VarField_gpstzdelay.nc4
diff --git a/test/testinput/013_SurfaceCxField_TskinSea.nc4 b/test/testinput/013_SurfaceCxField_TskinSea.nc4
diff --git a/test/testinput/015_UpperAirCxField_cloud_layer.nc4 b/test/testinput/015_UpperAirCxField_cloud_layer.nc4
diff --git a/test/testinput/015_VarField_cloud.nc4 b/test/testinput/015_VarField_cloud.nc4
diff --git a/test/testinput/016_SurfaceCxField_pmsl.nc4 b/test/testinput/016_SurfaceCxField_pmsl.nc4
diff --git a/test/testinput/017_SurfaceCxField_SeaIce.nc4 b/test/testinput/017_SurfaceCxField_SeaIce.nc4
diff --git a/test/testinput/017_VarField_mwemiss.nc4 b/test/testinput/017_VarField_mwemiss.nc4
diff --git a/test/testinput/018_VarField_tcozone.nc4 b/test/testinput/018_VarField_tcozone.nc4
diff --git a/test/testinput/019_VarField_satzenith.nc4 b/test/testinput/019_VarField_satzenith.nc4
diff --git a/test/testinput/021_VarField_surface.nc4 b/test/testinput/021_VarField_surface.nc4
diff --git a/test/testinput/022_SurfaceCxField_surf_param_a.nc4 b/test/testinput/022_SurfaceCxField_surf_param_a.nc4
diff --git a/test/testinput/023_SurfaceCxField_surf_param_b.nc4 b/test/testinput/023_SurfaceCxField_surf_param_b.nc4
diff --git a/test/testinput/023_VarField_modelsurface_geoval.nc4 b/test/testinput/023_VarField_modelsurface_geoval.nc4
diff --git a/test/testinput/024_SurfaceCxField_CloudAmount.nc4 b/test/testinput/024_SurfaceCxField_CloudAmount.nc4
diff --git a/test/testinput/028_VarField_satid.nc4 b/test/testinput/028_VarField_satid.nc4
diff --git a/test/testinput/029_UpperAirCxField_qcf.nc4 b/test/testinput/029_UpperAirCxField_qcf.nc4
diff --git a/test/testinput/030_UpperAirCxField_qcl.nc4 b/test/testinput/030_UpperAirCxField_qcl.nc4
diff --git a/test/testinput/031_UpperAirCxField_cloud_bulk.nc4 b/test/testinput/031_UpperAirCxField_cloud_bulk.nc4
diff --git a/test/testinput/031_VarField_solzenith.nc4 b/test/testinput/031_VarField_solzenith.nc4
diff --git a/test/testinput/033_UpperAirCxField_p_bar.nc4 b/test/testinput/033_UpperAirCxField_p_bar.nc4
diff --git a/test/testinput/034_UpperAirCxField_Cf.nc4 b/test/testinput/034_UpperAirCxField_Cf.nc4
diff --git a/test/testinput/034_VarField_iremiss.nc4 b/test/testinput/034_VarField_iremiss.nc4
diff --git a/test/testinput/035_UpperAirCxField_Cl.nc4 b/test/testinput/035_UpperAirCxField_Cl.nc4
diff --git a/test/testinput/035_VarField_cloudtopp.nc4 b/test/testinput/035_VarField_cloudtopp.nc4
diff --git a/test/testinput/036_VarField_cloudfrac.nc4 b/test/testinput/036_VarField_cloudfrac.nc4
diff --git a/test/testinput/041-046_UpperAirCxField_dust1-dust6.nc4 b/test/testinput/041-046_UpperAirCxField_dust1-dust6.nc4
diff --git a/test/testinput/051_VarField_u10ambwind.nc4 b/test/testinput/051_VarField_u10ambwind.nc4
diff --git a/test/testinput/052_VarField_v10ambwind.nc4 b/test/testinput/052_VarField_v10ambwind.nc4
diff --git a/test/testinput/053_VarField_awpriorpcorrect.nc4 b/test/testinput/053_VarField_awpriorpcorrect.nc4
diff --git a/test/testinput/056_SurfaceCxField_obukhov_length.nc4 b/test/testinput/056_SurfaceCxField_obukhov_length.nc4
diff --git a/test/testinput/057_SurfaceCxField_friction_velocity_over_water.nc4 b/test/testinput/057_SurfaceCxField_friction_velocity_over_water.nc4
diff --git a/test/testinput/057_VarField_emissivity.nc4 b/test/testinput/057_VarField_emissivity.nc4
diff --git a/test/testinput/063_VarField_radialVelocity.nc4 b/test/testinput/063_VarField_radialVelocity.nc4
diff --git a/test/testinput/067_VarField_GPS_Station_Height.nc4 b/test/testinput/067_VarField_GPS_Station_Height.nc4
diff --git a/test/testinput/068_VarField_clw.nc4 b/test/testinput/068_VarField_clw.nc4
diff --git a/test/testinput/071_VarField_bendingangle.nc4 b/test/testinput/071_VarField_bendingangle.nc4
diff --git a/test/testinput/072_VarField_impactparam.nc4 b/test/testinput/072_VarField_impactparam.nc4
diff --git a/test/testinput/073_VarField_ro_rad_curv.nc4 b/test/testinput/073_VarField_ro_rad_curv.nc4
diff --git a/test/testinput/074_VarField_ro_geoid_und.nc4 b/test/testinput/074_VarField_ro_geoid_und.nc4
diff --git a/test/testinput/076_VarField_britempvarerror.nc4 b/test/testinput/076_VarField_britempvarerror.nc4
diff --git a/test/testinput/077_VarField_aod.nc4 b/test/testinput/077_VarField_aod.nc4
diff --git a/test/testinput/078_VarField_theta.nc4 b/test/testinput/078_VarField_theta.nc4
diff --git a/test/testinput/080_VarField_biaspredictors.nc4 b/test/testinput/080_VarField_biaspredictors.nc4
diff --git a/test/testinput/CxWriter_UnRotateWinds.nc4 b/test/testinput/CxWriter_UnRotateWinds.nc4
diff --git a/test/testinput/CxWriter_UnRotateWinds10M.nc4 b/test/testinput/CxWriter_UnRotateWinds10M.nc4
diff --git a/test/testinput/cx_globalnamelist_abiclr.nc4 b/test/testinput/cx_globalnamelist_abiclr.nc4
diff --git a/test/testinput/cx_globalnamelist_ahiclr.nc4 b/test/testinput/cx_globalnamelist_ahiclr.nc4
diff --git a/test/testinput/cx_globalnamelist_aircraft.nc4 b/test/testinput/cx_globalnamelist_aircraft.nc4
diff --git a/test/testinput/cx_globalnamelist_amsr.nc4 b/test/testinput/cx_globalnamelist_amsr.nc4
diff --git a/test/testinput/cx_globalnamelist_atms.nc4 b/test/testinput/cx_globalnamelist_atms.nc4
diff --git a/test/testinput/cx_globalnamelist_atovs.nc4 b/test/testinput/cx_globalnamelist_atovs.nc4
diff --git a/test/testinput/cx_globalnamelist_gmihigh.nc4 b/test/testinput/cx_globalnamelist_gmihigh.nc4
diff --git a/test/testinput/cx_globalnamelist_gmilow.nc4 b/test/testinput/cx_globalnamelist_gmilow.nc4
diff --git a/test/testinput/cx_globalnamelist_gnssro.nc4 b/test/testinput/cx_globalnamelist_gnssro.nc4
diff --git a/test/testinput/cx_globalnamelist_groundgps.nc4 b/test/testinput/cx_globalnamelist_groundgps.nc4
diff --git a/test/testinput/cx_globalnamelist_iasi.nc4 b/test/testinput/cx_globalnamelist_iasi.nc4
diff --git a/test/testinput/cx_globalnamelist_mwsfy3.nc4 b/test/testinput/cx_globalnamelist_mwsfy3.nc4
diff --git a/test/testinput/cx_globalnamelist_oceanwinds.nc4 b/test/testinput/cx_globalnamelist_oceanwinds.nc4
diff --git a/test/testinput/cx_globalnamelist_sattcwv.nc4 b/test/testinput/cx_globalnamelist_sattcwv.nc4
diff --git a/test/testinput/cx_globalnamelist_scatwind.nc4 b/test/testinput/cx_globalnamelist_scatwind.nc4
diff --git a/test/testinput/cx_globalnamelist_screen.nc4 b/test/testinput/cx_globalnamelist_screen.nc4
diff --git a/test/testinput/cx_globalnamelist_seviriclr.nc4 b/test/testinput/cx_globalnamelist_seviriclr.nc4
diff --git a/test/testinput/cx_globalnamelist_sonde.nc4 b/test/testinput/cx_globalnamelist_sonde.nc4
diff --git a/test/testinput/cx_globalnamelist_ssmis.nc4 b/test/testinput/cx_globalnamelist_ssmis.nc4
diff --git a/test/testinput/cx_globalnamelist_surface.nc4 b/test/testinput/cx_globalnamelist_surface.nc4
diff --git a/test/testinput/cx_ukvnamelist_radar_doppler_wind.nc4 b/test/testinput/cx_ukvnamelist_radar_doppler_wind.nc4
diff --git a/test/testinput/cx_ukvnamelist_seviriasr.nc4 b/test/testinput/cx_ukvnamelist_seviriasr.nc4
diff --git a/test/testinput/cx_ukvnamelist_seviriclr.nc4 b/test/testinput/cx_ukvnamelist_seviriclr.nc4
diff --git a/test/testinput/cx_ukvnamelist_sonde.nc4 b/test/testinput/cx_ukvnamelist_sonde.nc4
diff --git a/test/testinput/cx_ukvnamelist_surface.nc4 b/test/testinput/cx_ukvnamelist_surface.nc4
diff --git a/test/testinput/cx_ukvnamelist_surfacecloud.nc4 b/test/testinput/cx_ukvnamelist_surfacecloud.nc4
diff --git a/test/testinput/dummy.nc4 b/test/testinput/dummy.nc4
diff --git a/test/testinput/reject_obs_with_all_variables_failing_qc.nc4 b/test/testinput/reject_obs_with_all_variables_failing_qc.nc4
diff --git a/test/testinput/reject_obs_with_all_variables_failing_qc_satellite.nc4 b/test/testinput/reject_obs_with_all_variables_failing_qc_satellite.nc4
diff --git a/test/testinput/relative_humidity_Sonde.nc4 b/test/testinput/relative_humidity_Sonde.nc4
diff --git a/test/testinput/varobs_globalnamelist_abiclr.nc4 b/test/testinput/varobs_globalnamelist_abiclr.nc4
diff --git a/test/testinput/varobs_globalnamelist_ahiclr.nc4 b/test/testinput/varobs_globalnamelist_ahiclr.nc4
diff --git a/test/testinput/varobs_globalnamelist_aircraft.nc4 b/test/testinput/varobs_globalnamelist_aircraft.nc4
diff --git a/test/testinput/varobs_globalnamelist_atms.nc4 b/test/testinput/varobs_globalnamelist_atms.nc4
diff --git a/test/testinput/varobs_globalnamelist_atovs.nc4 b/test/testinput/varobs_globalnamelist_atovs.nc4
diff --git a/test/testinput/varobs_globalnamelist_gnssro.nc4 b/test/testinput/varobs_globalnamelist_gnssro.nc4
diff --git a/test/testinput/varobs_globalnamelist_iasi.nc4 b/test/testinput/varobs_globalnamelist_iasi.nc4
diff --git a/test/testinput/varobs_globalnamelist_scatwind.nc4 b/test/testinput/varobs_globalnamelist_scatwind.nc4
diff --git a/test/testinput/varobs_globalnamelist_seviriclr.nc4 b/test/testinput/varobs_globalnamelist_seviriclr.nc4
diff --git a/test/testinput/varobs_globalnamelist_sonde.nc4 b/test/testinput/varobs_globalnamelist_sonde.nc4
diff --git a/test/testinput/varobs_ukvnamelist_radar_doppler_wind.nc4 b/test/testinput/varobs_ukvnamelist_radar_doppler_wind.nc4
diff --git a/test/testinput/varobs_ukvnamelist_seviriasr.nc4 b/test/testinput/varobs_ukvnamelist_seviriasr.nc4
diff --git a/test/testinput/varobs_ukvnamelist_seviriclr.nc4 b/test/testinput/varobs_ukvnamelist_seviriclr.nc4
diff --git a/test/testinput/varobs_ukvnamelist_sonde.nc4 b/test/testinput/varobs_ukvnamelist_sonde.nc4
diff --git a/test/testinput/varobs_ukvnamelist_surfacecloud.nc4 b/test/testinput/varobs_ukvnamelist_surfacecloud.nc4