diff --git a/Varfields.md b/Varfields.md index 32a48fb7..7098ffa9 100644 --- a/Varfields.md +++ b/Varfields.md @@ -31,7 +31,7 @@ | 31 | `VarField_solzenith` | `SolarZenith(:)` | solar zenith angle | `MetaData/solarZenithAngle` | | | 32 | `VarField_solazimth` | | | | Implement | | 34 | `VarField_iremiss` | `IREmiss(:)` | surface emissivity (satellite 1dvar) | 'Emiss/emissivityIR' | | -| 35 | `VarField_cloudtopp` | `CloudTopP(:)` | cloud top pressure (hPa) (satellite 1dvar) | `OneDVar/pressureAtTopOfCloud` | | +| 35 | `VarField_cloudtopp` | `CloudTopP(:)` | cloud top pressure (hPa) (satellite 1dvar) | `OutputToVAR/pressureAtTopOfCloud` | | | 36 | `VarField_cloudfrac` | `CloudFrac(:)` | cloud fraction (satellite 1dvar) | `OneDVar/cloudAmount` | | | 39 | `VarField_vnatovpp` | | | | Implement | | 40 | `VarField_procoption` | | | | Implement | diff --git a/src/opsinputs/opsinputs_varobswriter_mod.F90 b/src/opsinputs/opsinputs_varobswriter_mod.F90 index 16cb5039..f4021589 100644 --- a/src/opsinputs/opsinputs_varobswriter_mod.F90 +++ b/src/opsinputs/opsinputs_varobswriter_mod.F90 @@ -919,7 +919,7 @@ subroutine opsinputs_varobswriter_populateobservations( & case (VarField_cloudtopp) call opsinputs_fill_fillreal( & Ob % Header % CloudTopP, "CloudTopP", JediToOpsLayoutMapping, Ob % CloudTopP, & - ObsSpace, "pressureAtTopOfCloud", "OneDVar") + ObsSpace, "pressureAtTopOfCloud", "OutputToVAR") case (VarField_cloudfrac) call opsinputs_fill_fillreal( & Ob % Header % CloudFrac, "CloudFrac", JediToOpsLayoutMapping, Ob % CloudFrac, & diff --git a/test/generate_unittest_netcdfs.py b/test/generate_unittest_netcdfs.py index 0c2ccb95..7d56ab0e 100644 --- a/test/generate_unittest_netcdfs.py +++ b/test/generate_unittest_netcdfs.py @@ -648,7 +648,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): output_1d_normal_int_var_to_netcdf('satelliteIdentifier', 'MetaData', 'testinput/028_VarField_satid.nc4') output_1d_normal_var_to_netcdf ('solarZenithAngle', 'MetaData', 'testinput/031_VarField_solzenith.nc4') output_1d_normal_var_to_netcdf ('emissivityIR', 'Emiss', 'testinput/034_VarField_iremiss.nc4') - output_1d_normal_var_to_netcdf ('pressureAtTopOfCloud', 'OneDVar', 'testinput/035_VarField_cloudtopp.nc4') + output_1d_normal_var_to_netcdf ('pressureAtTopOfCloud', 'OutputToVAR', 'testinput/035_VarField_cloudtopp.nc4') output_1d_normal_var_to_netcdf ('cloudAmount', 'OneDVar', 'testinput/036_VarField_cloudfrac.nc4') output_2d_simulated_var_to_netcdf('windEastward', 'testinput/051_VarField_u10ambwind.nc4', with_bias=True) output_2d_simulated_var_to_netcdf('windNorthward', 'testinput/052_VarField_v10ambwind.nc4', with_bias=True) @@ -747,7 +747,7 @@ def copy_var_to_var(Group, invarname, outvarname, filename): # IASI - this tests the variable_for_quality_control option output_full_varobs_to_netcdf(['MetaData/latitude','MetaData/longitude', 'OneDVar/skinTemperature','MetaData/sensorZenithAngle', - 'MetaData/solarZenithAngle','OneDVar/pressureAtTopOfCloud','OneDVar/cloudAmount', + 'MetaData/solarZenithAngle','OutputToVAR/pressureAtTopOfCloud','OneDVar/cloudAmount', 'MetaData/ozoneTotal'], ['ObsValue/radiance','DerivedObsValue/brightnessTemperature','EffectiveError/brightnessTemperature', 'OneDVar/emissivity', 'BiasCorrObsValue/brightnessTemperature', diff --git a/test/testinput/035_VarField_cloudtopp.nc4 b/test/testinput/035_VarField_cloudtopp.nc4 index e31f74e7..e9f50dd0 100644 Binary files a/test/testinput/035_VarField_cloudtopp.nc4 and b/test/testinput/035_VarField_cloudtopp.nc4 differ diff --git a/test/testinput/varobs_globalnamelist_iasi.nc4 b/test/testinput/varobs_globalnamelist_iasi.nc4 index 23261fbf..ff0d9017 100644 Binary files a/test/testinput/varobs_globalnamelist_iasi.nc4 and b/test/testinput/varobs_globalnamelist_iasi.nc4 differ