Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions deps/ops/stubs/OpsMod_Varobs/Ops_GetDefaultVarfields.inc
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,16 @@ SELECT CASE (ObsGroup)
Varfield_numchans,Varfield_channum,VarField_satid, &
VarField_tcozone,VarField_solzenith,VarField_QCinfo, &
VarField_clw/)
CASE (ObsGroupEPSMWS) !setup for jedi
Varfields(1:10) = (/Varfield_britemp,Varfield_satid,Varfield_satzenith, &
Varfield_solzenith,Varfield_tskin, &
Varfield_surface,Varfield_numchans,Varfield_channum, &
Varfield_mwemiss, varfield_biaspredictors /)
CASE (ObsGroupSternaMWS) !set up for jedi
Varfields(1:10) = (/Varfield_britemp,Varfield_satid,Varfield_satzenith, &
Varfield_solzenith,Varfield_tskin, &
Varfield_surface,Varfield_numchans,Varfield_channum, &
Varfield_mwemiss, varfield_biaspredictors /)
CASE (ObsGroupRainAccum)
Varfields(1:1) = (/Varfield_RainAccum/)
END SELECT
Expand Down
14 changes: 13 additions & 1 deletion deps/ops/stubs/OpsMod_Varobs/Ops_SetupVarobsLevDepC.inc
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,9 @@ USE OpsMod_ObsGroupInfo, ONLY: &
ObsGroupOceanWinds, &
ObsGroupGIIRSLW, &
ObsGroupGIIRSMW, &
ObsGroupMTGIRS
ObsGroupMTGIRS, &
ObsGroupEPSMWS, &
ObsGroupSternaMWS

USE OpsMod_ObsInfo, ONLY: &
OB_type
Expand Down Expand Up @@ -338,6 +340,16 @@ SELECT CASE (Observations % header % ObsGroup)

ObsLevelType = 0.0
NumLevelLevs = 1

CASE (ObsGroupSternaMWS)

ObsLevelType = 0.0
NumLevelLevs = 1

CASE (ObsGroupEPSMWS)

ObsLevelType = 0.0
NumLevelLevs = 1

END SELECT

Expand Down
2 changes: 2 additions & 0 deletions deps/ops/stubs/Ops_Constants/OpsFn_IsSatRadGroup.inc
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ IF (obsgroup == ObsGroupABIClr .OR. &
obsgroup == ObsGroupAMSUB .OR. &
obsgroup == ObsGroupATMS .OR. &
obsgroup == ObsGroupATOVS .OR. &
obsgroup == ObsGroupEPSMWS .OR. &
obsgroup == ObsGroupTOVS .OR. &
obsgroup == ObsGroupCOMSMIClr .OR. &
obsgroup == ObsGroupCRIS .OR. &
Expand All @@ -43,6 +44,7 @@ IF (obsgroup == ObsGroupABIClr .OR. &
obsgroup == ObsGroupGMIlow .OR. &
obsgroup == ObsGroupGMIhigh .OR. &
obsgroup == ObsGroupSSMIS .OR. &
obsgroup == ObsGroupSternaMWS .OR. &
obsgroup == ObsGroupGIIRSLW .OR. &
obsgroup == ObsGroupGIIRSMW .OR. &
obsgroup == ObsGroupMTGIRS) THEN
Expand Down
4 changes: 4 additions & 0 deletions deps/ops/stubs/Ops_Constants/OpsFn_ObsGroupNameToNum.inc
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,10 @@ SELECT CASE (ObsGroupName)
OpsFn_ObsGroupNameToNum = ObsGroupSurfaceCloud
CASE ("MTGIRS")
OpsFn_ObsGroupNameToNum = ObsGroupMTGIRS
CASE ("EPSMWS")
OpsFn_ObsGroupNameToNum = ObsGroupEPSMWS
CASE ("SternaMWS")
OpsFn_ObsGroupNameToNum = ObsGroupSternaMWS
CASE DEFAULT
OpsFn_ObsGroupNameToNum = IMDI
END SELECT
Expand Down
4 changes: 4 additions & 0 deletions deps/ops/stubs/Ops_Constants/OpsFn_ObsGroupNumToName.inc
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@ SELECT CASE (ObsGroup)
OpsFn_ObsGroupNumToName = "SurfaceCloud"
CASE (ObsGroupMTGIRS)
OpsFn_ObsGroupNumToName = "MTGIRS"
CASE (ObsGroupEPSMWS)
OpsFn_ObsGroupNumToName = "EPSMWS"
CASE (ObsGroupSternaMWS)
OpsFn_ObsGroupNumToName = "SternaMWS"
CASE DEFAULT
OpsFn_ObsGroupNumToName = "Unknown"
END SELECT
Expand Down
4 changes: 3 additions & 1 deletion deps/ops/stubs/Ops_Constants/OpsMod_ObsGroupInfo.f90
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ MODULE OpsMod_ObsGroupInfo
INTEGER, PARAMETER :: ObsGroupMTGIRS = 67 ! => MTG-IRS radiances
INTEGER, PARAMETER :: ObsGroupFCIASR = 68 ! => FCI all-sky radiances
INTEGER, PARAMETER :: ObsGroupFCIClr = 69 ! => FCI clear-sky radiances
INTEGER, PARAMETER :: max_obs_group_num = 69 ! Number of observation groups
INTEGER, PARAMETER :: ObsGroupSternaMWS = 70 ! => AWS & Sterna microwave radiances
INTEGER, PARAMETER :: ObsGroupEPSMWS = 71 ! => EPS SG MWS
INTEGER, PARAMETER :: max_obs_group_num = 71 ! Number of observation groups

CONTAINS

Expand Down
4 changes: 4 additions & 0 deletions deps/ops/stubs/Ops_Constants/OpsMod_ObsTypes.f90
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,10 @@ MODULE OpsMod_ObsTypes

INTEGER, PARAMETER :: ObsTypeGIIRS = 29400 ! => GIIRS

INTEGER, PARAMETER :: ObsTypeAWS = 29600 ! => Arctic weather satellite radiances

INTEGER, PARAMETER :: ObsTypeMWSSG = 29700 ! => EPSSG MWS radiances

! Aircraft data
INTEGER, PARAMETER :: ObsTypeAmdar = 30100 ! => Amdar
INTEGER, PARAMETER :: ObsTypeAirep = 30200 ! => airep
Expand Down
4 changes: 4 additions & 0 deletions deps/ops/stubs/Ops_Constants/Ops_SubTypeNameToNum.inc
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ SELECT CASE (name)
num = ObsTypeATOVS_G
CASE ("ATOVSL")
num = ObsTypeATOVS_L
CASE ("AWS")
num = ObsTypeAWS
CASE ("TOVSG")
num = ObsTypeTOVS_G
CASE ("TOVSL")
Expand Down Expand Up @@ -202,6 +204,8 @@ SELECT CASE (name)
num = ObsTypeMWRI
CASE ("MWTS")
num = ObsTypeMWSFY3
CASE ("MWSSG")
num = ObsTypeMWSSG
CASE ("OCEANCOL")
num = ObsTypeOceanColour
CASE ("OCEANFB")
Expand Down
4 changes: 4 additions & 0 deletions deps/ops/stubs/Ops_Constants/Ops_SubTypeNumToName.inc
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ SELECT CASE (num)
name = "ATOVSG"
CASE (ObsTypeATOVS_L)
name = "ATOVSL"
CASE (ObsTypeAWS)
name = "AWS"
CASE (ObsTypeTOVS_G)
name = "TOVSG"
CASE (ObsTypeTOVS_L)
Expand Down Expand Up @@ -203,6 +205,8 @@ SELECT CASE (num)
name = "MWHS"
CASE (ObsTypeMWRI)
name = "MWRI"
CASE (ObsTypeMWSSG)
name = "MWSSG"
CASE (ObsTypeOceanColour)
name = "OCEANCOL"
CASE (ObsTypeOceanFB)
Expand Down
3 changes: 3 additions & 0 deletions etc/global/cx/SternaMWS.nl
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
&CXControlNL
CxFields=4,10,12,24,31,33,254,266,267,268,407,409,3209,3210,3236,3245,16222
/
3 changes: 3 additions & 0 deletions etc/global/varobs/SternaMWS.nl
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
&VarobsControlNL
Varfields=10,11,17,19,21,54,55,28,31,80
/
6 changes: 5 additions & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,11 @@ ADD_WRITER_TEST(NAME varobswriter_globalnamelist_aircraft
YAML varobswriter_globalnamelist_aircraft.yaml
NAMELIST ../../etc/global/varobs/Aircraft.nl
DATA varobs_globalnamelist_aircraft.nc4)

ADD_WRITER_TEST(NAME varobswriter_globalnamelist_sternamws
YAML varobswriter_globalnamelist_sternamws.yaml
NAMELIST ../../etc/global/varobs/SternaMWS.nl
DATA varobs_globalnamelist_sternamws.nc4)

# Tests the UKV namelist files in the etc directory

ADD_WRITER_TEST(NAME varobswriter_ukvnamelist_seviviasr
Expand Down
10 changes: 10 additions & 0 deletions test/generate_unittest_netcdfs.py
Original file line number Diff line number Diff line change
Expand Up @@ -783,6 +783,16 @@ def copy_var_to_var(Group, invarname, outvarname, filename):
['MetaData/surfaceQualifier', 'MetaData/satelliteIdentifier'],
'testinput/varobs_globalnamelist_atovs.nc4')

# Sterna MWS
output_full_varobs_to_netcdf(['MetaData/latitude', 'MetaData/longitude', 'OneDVar/skinTemperature', 'MetaData/sensorZenithAngle',
'MetaData/solarZenithAngle'],
['ObsValue/brightnessTemperature', 'ObsError/brightnessTemperature', 'Emiss/emissivity',
'BiasCorrObsValue/brightnessTemperature', 'thickness_850_300hPa_satid_13Predictor/brightnessTemperature',
'thickness_850_300hPa_satid_17Predictor/brightnessTemperature'],
['MetaData/surfaceQualifier', 'MetaData/satelliteIdentifier'],
'testinput/varobs_globalnamelist_sternamws.nc4')


# GNSS-RO
output_full_varobs_to_netcdf(['MetaData/latitude',
'MetaData/longitude',
Expand Down
Binary file not shown.
Loading
Loading