Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
b4522a2
Add BUFR2IODA python API converter to prepoceanobs
ShastriPaturi Feb 8, 2024
8419802
fix coding norm
ShastriPaturi Feb 8, 2024
7ef2abf
fix coding norm
ShastriPaturi Feb 8, 2024
536d9c2
fix coding norm
ShastriPaturi Feb 8, 2024
02fe4e6
cleaned up obsprep_config.yaml: added type, removed output_file
ShastriPaturi Feb 13, 2024
30eeae7
copy BUFR IODA output to ROTDIR
ShastriPaturi Feb 14, 2024
75ffc6f
updated BUFR IODA output filename
ShastriPaturi Feb 14, 2024
7623bd9
all the monthly and fixed and drifting buoys added
ShastriPaturi Feb 16, 2024
f6b93da
ObsSpace yamls: all the monthly and fixed and drifting buoys added
ShastriPaturi Feb 16, 2024
a528afd
resolve conflict
ShastriPaturi Feb 16, 2024
d7d657f
arranged modules alphabetically
ShastriPaturi Feb 20, 2024
e522587
fix coding norm
ShastriPaturi Feb 20, 2024
b644cc1
module import update
ShastriPaturi Feb 21, 2024
1dba075
module import update+1
ShastriPaturi Feb 21, 2024
60ecb97
module import update+2
ShastriPaturi Feb 21, 2024
2da25c8
module import update+3
ShastriPaturi Feb 21, 2024
b5ab1e8
module import update+4
ShastriPaturi Feb 21, 2024
8dfc869
module import update+5
ShastriPaturi Feb 21, 2024
c512774
Merge branch 'develop' into feature/marine_addBUFR2IODAconverter
ShastriPaturi Feb 21, 2024
1a24a91
fix prep obs failure
ShastriPaturi Feb 26, 2024
47a051f
Merge branch 'develop' into feature/marine_addBUFR2IODAconverter
ShastriPaturi Feb 26, 2024
5a8c588
update insitu yamls
ShastriPaturi Feb 28, 2024
25c22eb
Merge branch 'develop' into feature/marine_addBUFR2IODAconverter
ShastriPaturi Feb 28, 2024
b00a74d
Merge branch 'develop' into feature/marine_addBUFR2IODAconverter
ShastriPaturi Feb 28, 2024
0161478
Merge branch 'develop' into feature/marine_addBUFR2IODAconverter
ShastriPaturi Feb 29, 2024
309aa9a
Merge branch 'develop' into feature/marine_addBUFR2IODAconverter
ShastriPaturi Feb 29, 2024
a418180
Fixed typo
ShastriPaturi Feb 29, 2024
4300340
Merge branch 'feature/marine_addBUFR2IODAconverter' of https://github…
ShastriPaturi Feb 29, 2024
4852fcd
Merge branch 'develop' into feature/marine_addBUFR2IODAconverter
ShastriPaturi Mar 1, 2024
57d849e
Merge branch 'develop' into feature/marine_addBUFR2IODAconverter
ShastriPaturi Mar 1, 2024
10ad109
Merge branch 'develop' into feature/marine_addBUFR2IODAconverter
ShastriPaturi Mar 4, 2024
bf077ab
copy daily insitu subsampled
ShastriPaturi Mar 4, 2024
466d433
Add json files for situ surface
ShastriPaturi Mar 4, 2024
b4e64a0
Merge branch 'develop' into feature/marine_addBUFR2IODAconverter
guillaumevernieres Mar 13, 2024
d87fc0f
Merge branch 'develop' into feature/marine_addBUFR2IODAconverter
guillaumevernieres Mar 19, 2024
4f57720
Merge branch 'develop' into feature/marine_addBUFR2IODAconverter
AndrewEichmann-NOAA Mar 25, 2024
e6b3e38
Update obsprep_config.yaml
ShastriPaturi Mar 25, 2024
c92feef
monthly insitu
ShastriPaturi Mar 25, 2024
b237995
Merge branch 'feature/marine_addBUFR2IODAconverter' of https://github…
ShastriPaturi Mar 25, 2024
12a0903
monthly insitu json
ShastriPaturi Mar 25, 2024
8d946ae
monthly insitu json: altkob
ShastriPaturi Mar 25, 2024
e64c9e4
Merge branch 'develop' into feature/marine_addBUFR2IODAconverter
AndrewEichmann-NOAA Mar 26, 2024
98682c2
make obs prep ctest work without new jjob
AndrewEichmann-NOAA Mar 26, 2024
4be9a35
Merge branch 'develop' into feature/marine_addBUFR2IODAconverter
CoryMartin-NOAA Mar 28, 2024
302c328
yaml tidy
guillaumevernieres Mar 28, 2024
118a30b
Merge branch 'develop' into feature/marine_addBUFR2IODAconverter
guillaumevernieres Mar 28, 2024
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
12 changes: 12 additions & 0 deletions parm/ioda/bufr2ioda/bufr2ioda_insitu_profile_argo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"data_format" : "subpfl",
"subsets" : "SUBPFL",
"source" : "NCEP data tank",
"data_type" : "argo",
"cycle_type" : "{{ RUN }}",
"cycle_datetime" : "{{ current_cycle | to_YMDH }}",
"dump_directory" : "{{ DMPDIR }}",
"ioda_directory" : "{{ COM_OBS }}",
"data_description" : "6-hrly in situ ARGO profiles",
"data_provider" : "U.S. NOAA"
}
12 changes: 12 additions & 0 deletions parm/ioda/bufr2ioda/bufr2ioda_insitu_profile_bathy.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"data_format" : "bathy",
"subsets" : "BATHY",
"source" : "NCEP data tank",
"data_type" : "bathy",
"cycle_type" : "{{ RUN }}",
"cycle_datetime" : "{{ current_cycle | to_YMDH }}",
"dump_directory" : "{{ DMPDIR }}",
"ioda_directory" : "{{ COM_OBS }}",
"data_description" : "6-hrly in situ Bathythermal profiles",
"data_provider" : "U.S. NOAA"
}
12 changes: 12 additions & 0 deletions parm/ioda/bufr2ioda/bufr2ioda_insitu_profile_dbuoy.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"data_format" : "dbuoy",
"subsets" : "DBUOY",
"source" : "NCEP data tank",
"data_type" : "dbuoy",
"cycle_type" : "{{ RUN }}",
"cycle_datetime" : "{{ current_cycle | to_YMDH }}",
"dump_directory" : "{{ DMPDIR }}",
"ioda_directory" : "{{ COM_OBS }}",
"data_description" : "6-hrly in situ drifting buoy (TAC:drifters, etc) profiles",
"data_provider" : "U.S. NOAA"
}
12 changes: 12 additions & 0 deletions parm/ioda/bufr2ioda/bufr2ioda_insitu_profile_dbuoyb.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"data_format" : "dbuoyb",
"subsets" : "DBUOYB",
"source" : "NCEP data tank",
"data_type" : "dbuoyb",
"cycle_type" : "{{ RUN }}",
"cycle_datetime" : "{{ current_cycle | to_YMDH }}",
"dump_directory" : "{{ DMPDIR }}",
"ioda_directory" : "{{ COM_OBS }}",
"data_description" : "6-hrly in situ drifting buoy (BUFR:drifters, etc) profiles",
"data_provider" : "U.S. NOAA"
}
12 changes: 12 additions & 0 deletions parm/ioda/bufr2ioda/bufr2ioda_insitu_profile_glider.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"data_format" : "subpfl",
"subsets" : "SUBPFL",
"source" : "NCEP data tank",
"data_type" : "glider",
"cycle_type" : "{{ RUN }}",
"cycle_datetime" : "{{ current_cycle | to_YMDH }}",
"dump_directory" : "{{ DMPDIR }}",
"ioda_directory" : "{{ COM_OBS }}",
"data_description" : "6-hrly in situ GLIDER profiles",
"data_provider" : "U.S. NOAA"
}
12 changes: 12 additions & 0 deletions parm/ioda/bufr2ioda/bufr2ioda_insitu_profile_marinemammals.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"data_format" : "tesac",
"subsets" : "TESAC",
"source" : "NCEP data tank",
"data_type" : "marinemammals",
"cycle_type" : "{{ RUN }}",
"cycle_datetime" : "{{ current_cycle | to_YMDH }}",
"dump_directory" : "{{ DMPDIR }}",
"ioda_directory" : "{{ COM_OBS }}",
"data_description" : "6-hrly in situ Marine Mammals profiles",
"data_provider" : "U.S. NOAA"
}
12 changes: 12 additions & 0 deletions parm/ioda/bufr2ioda/bufr2ioda_insitu_profile_mbuoy.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"data_format" : "mbuoy",
"subsets" : "MBUOY",
"source" : "NCEP data tank",
"data_type" : "mbuoy",
"cycle_type" : "{{ RUN }}",
"cycle_datetime" : "{{ current_cycle | to_YMDH }}",
"dump_directory" : "{{ DMPDIR }}",
"ioda_directory" : "{{ COM_OBS }}",
"data_description" : "6-hrly in situ moored buoy (TAC:Tropical Mooring) profiles",
"data_provider" : "U.S. NOAA"
}
12 changes: 12 additions & 0 deletions parm/ioda/bufr2ioda/bufr2ioda_insitu_profile_mbuoyb.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"data_format" : "mbuoyb",
"subsets" : "MBUOYB",
"source" : "NCEP data tank",
"data_type" : "mbuoyb",
"cycle_type" : "{{ RUN }}",
"cycle_datetime" : "{{ current_cycle | to_YMDH }}",
"dump_directory" : "{{ DMPDIR }}",
"ioda_directory" : "{{ COM_OBS }}",
"data_description" : "6-hrly in situ moored buoy (BUFR:Tropical Mooring) profiles",
"data_provider" : "U.S. NOAA"
}
12 changes: 12 additions & 0 deletions parm/ioda/bufr2ioda/bufr2ioda_insitu_profile_tesac.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"data_format" : "tesac",
"subsets" : "TESAC",
"source" : "NCEP data tank",
"data_type" : "tesac",
"cycle_type" : "{{ RUN }}",
"cycle_datetime" : "{{ current_cycle | to_YMDH }}",
"dump_directory" : "{{ DMPDIR }}",
"ioda_directory" : "{{ COM_OBS }}",
"data_description" : "6-hrly in situ TESAC profiles",
"data_provider" : "U.S. NOAA"
}
12 changes: 12 additions & 0 deletions parm/ioda/bufr2ioda/bufr2ioda_insitu_profile_xbtctd.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"data_format" : "xbtctd",
"subsets" : "XBTCTD",
"source" : "NCEP data tank",
"data_type" : "xbtctd",
"cycle_type" : "{{ RUN }}",
"cycle_datetime" : "{{ current_cycle | to_YMDH }}",
"dump_directory" : "{{ DMPDIR }}",
"ioda_directory" : "{{ COM_OBS }}",
"data_description" : "6-hrly in situ XBT/XCTD profiles",
"data_provider" : "U.S. NOAA"
}
12 changes: 12 additions & 0 deletions parm/ioda/bufr2ioda/bufr2ioda_insitu_surface_altkob.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"data_format" : "altkob",
"subsets" : "ALTKOB",
"source" : "NCEP data tank",
"data_type" : "altkob",
"cycle_type" : "{{ RUN }}",
"cycle_datetime" : "{{ current_cycle | to_YMDH }}",
"dump_directory" : "{{ DMPDIR }}",
"ioda_directory" : "{{ COM_OBS }}",
"data_description" : "6-hrly in situ ALTKOB surface",
"data_provider" : "U.S. NOAA"
}
12 changes: 12 additions & 0 deletions parm/ioda/bufr2ioda/bufr2ioda_insitu_surface_ships.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"data_format" : "ships",
"subsets" : "SHIPS",
"source" : "NCEP data tank",
"data_type" : "bathy",
"cycle_type" : "{{ RUN }}",
"cycle_datetime" : "{{ current_cycle | to_YMDH }}",
"dump_directory" : "{{ DMPDIR }}",
"ioda_directory" : "{{ COM_OBS }}",
"data_description" : "6-hrly in situ ship (TAC: restriced) surface",
"data_provider" : "U.S. NOAA"
}
12 changes: 12 additions & 0 deletions parm/ioda/bufr2ioda/bufr2ioda_insitu_surface_shipsu.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"data_format" : "shipsu",
"subsets" : "SHIPSU",
"source" : "NCEP data tank",
"data_type" : "shipsu",
"cycle_type" : "{{ RUN }}",
"cycle_datetime" : "{{ current_cycle | to_YMDH }}",
"dump_directory" : "{{ DMPDIR }}",
"ioda_directory" : "{{ COM_OBS }}",
"data_description" : "6-hrly in situ ship (TAC: unrestricted) surface",
"data_provider" : "U.S. NOAA"
}
12 changes: 12 additions & 0 deletions parm/ioda/bufr2ioda/bufr2ioda_insitu_surface_trkob.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"data_format" : "trkob",
"subsets" : "TRACKOB",
"source" : "NCEP data tank",
"data_type" : "trackob",
"cycle_type" : "{{ RUN }}",
"cycle_datetime" : "{{ current_cycle | to_YMDH }}",
"dump_directory" : "{{ DMPDIR }}",
"ioda_directory" : "{{ COM_OBS }}",
"data_description" : "6-hrly in situ TRACKOB surface",
"data_provider" : "U.S. NOAA"
}
22 changes: 22 additions & 0 deletions parm/soca/obs/config/dev/insitu_profile_argo.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
obs space:
name: insitu_profile_argo
obsdatain:
engine:
type: H5File
obsfile: !ENV ${DATA}/obs/${OPREFIX}insitu_profile_argo.${PDY}${cyc}.nc4
obsdataout:
engine:
type: H5File
obsfile: !ENV ${DATA}/diags/insitu_profile_argo.${PDY}${cyc}.nc4
simulated variables: [waterTemperature, salinity]
observed variables: [waterTemperature, salinity]
io pool:
max pool size: 1
obs operator:
name: Composite
components:
- name: InsituTemperature
variables:
- name: waterTemperature
obs error:
covariance model: diagonal
158 changes: 158 additions & 0 deletions parm/soca/obs/config/dev/insitu_profile_bathy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
obs space:
name: insitu_profile_bathy
obsdatain:
engine:
type: H5File
obsfile: !ENV ${DATA}/obs/${OPREFIX}insitu_profile_bathy.${PDY}${cyc}.nc4
obsdataout:
engine:
type: H5File
obsfile: !ENV ${DATA}/diags/insitu_profile_bathy.${PDY}${cyc}.nc4
simulated variables: [waterTemperature]
io pool:
max pool size: 1
obs operator:
name: InsituTemperature
obs error:
covariance model: diagonal

#--------------------------------------------------------------------------------------
# START OF OBS FILTERS
# The QC filters used here are based on the document by IODE that can be found at
# https://cdn.ioos.noaa.gov/media/2017/12/recommendations_in_situ_data_real_time_qc.pdf
#--------------------------------------------------------------------------------------
obs filters:

# Land Check
- filter: Domain Check
where:
- variable: {name: GeoVaLs/sea_area_fraction}
minvalue: 0.5
#--------------------------------------------------------------------------------------
## Filters for T:
#--------------------------------------------------------------------------------------
#------------------------------------------------------------------------------------
### Global range test
#------------------------------------------------------------------------------------
- filter: Bounds Check
filter variables: [{name: waterTemperature}]
minvalue: -2.5
maxvalue: 40.0

#------------------------------------------------------------------------------------
### Regional range tests
#------------------------------------------------------------------------------------

#### Red Sea
#------------------------------------------------------------------------------------
####
#### the document linked here describes Red sea as the are between 10N, 40E;
#### 20N, 50E; 30N, 30E; 10N, 40E. But that would also include Gulf of Aden.
#### A more reasonable choice seemed to be a box that extends from 10 N to
#### 30 N and 30 E to 45 East .
#------------------------------------------------------------------------------------
- filter: Bounds Check
filter variables: [{name: waterTemperature}]
minvalue: 21.7
maxvalue: 40.0
where:
- variable:
name: MetaData/latitude
minvalue: 10
maxvalue: 30
- variable:
name: MetaData/longitude
minvalue: 30

#### Mediterranean Sea
#-----------------------------------------------------------------------------
##### Area 1/3 for Mediterranean Sea
- filter: Bounds Check
filter variables: [{name: waterTemperature}]
minvalue: 10.0
maxvalue: 40.0
where:
- variable:
name: MetaData/latitude
minvalue: 30
maxvalue: 40
- variable:
name: MetaData/longitude
minvalue: -6
maxvalue: 40
##### Area 2/3 for Mediterranean Sea
- filter: Bounds Check
filter variables: [{name: waterTemperature}]
minvalue: 10.0
maxvalue: 40.0
where:
- variable:
name: MetaData/latitude
minvalue: 40
maxvalue: 41.5
- variable:
name: MetaData/longitude
minvalue: 20
maxvalue: 30
##### Area 3/3 for Mediterranean Sea
- filter: Bounds Check
filter variables: [{name: waterTemperature}]
minvalue: 10.0
maxvalue: 40.0
where:
- variable:
name: MetaData/latitude
minvalue: 40
maxvalue: 46
- variable:
name: MetaData/longitude
minvalue: 0
maxvalue: 20

#### Northwestern shelves
#-----------------------------------------------------------------------------
- filter: Bounds Check
filter variables: [{name: waterTemperature}]
minvalue: -2.0
maxvalue: 24.0
where:
- variable:
name: MetaData/latitude
minvalue: 50
maxvalue: 60
- variable:
name: MetaData/longitude
minvalue: -20
maxvalue: 10
#### Southwestern shelves
#-----------------------------------------------------------------------------
- filter: Bounds Check
filter variables: [{name: waterTemperature}]
minvalue: -2.0
maxvalue: 30
where:
- variable:
name: MetaData/latitude
minvalue: 25
maxvalue: 50
- variable:
name: MetaData/longitude
minvalue: -30
maxvalue: 0

#### Arctic Sea
#-----------------------------------------------------------------------------
- filter: Bounds Check
filter variables: [{name: waterTemperature}]
minvalue: -1.92
maxvalue: 25.0
where:
- variable:
name: MetaData/latitude
minvalue: 60

- filter: Background Check
filter variables: [{name: waterTemperature}]
threshold: 5.0
absolute threshold: 5.0

Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
obs space:
name: insitu_profile_bathy
name: insitu_profile_dbuoy
obsdatain:
engine:
type: H5File
obsfile: !ENV ${DATA}/obs/${OPREFIX}insitu_profile_bathy.${PDY}${cyc}.nc4
obsfile: !ENV ${DATA}/obs/${OPREFIX}insitu_profile_dbuoy.${PDY}${cyc}.nc4
obsdataout:
engine:
type: H5File
obsfile: !ENV ${DATA}/diags/insitu_profile_bathy.${PDY}${cyc}.nc4
obsfile: !ENV ${DATA}/diags/insitu_profile_dbuoy.${PDY}${cyc}.nc4
simulated variables: [waterTemperature, salinity]
observed variables: [waterTemperature, salinity]
io pool:
Expand Down
Loading