Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,8 @@ def obs_extract_overlap(obs_1, obs_2):
start_2 = obs_2.coord("time").cell(0).point
end_2 = obs_2.coord("time").cell(-1).point

start_overlap = max(start_1, start_2)
end_overlap = min(end_1, end_2)
start_overlap = max(start_1, start_2).replace(day=1, hour=0)
end_overlap = min(end_1, end_2).replace(day=31, hour=12)
# convert to yymmdd? use extract time, num2date
logger.info(
"%s, %s obs time overlap: %s to %s",
Expand Down Expand Up @@ -416,6 +416,11 @@ def main(cfg):
variable_group=var_prep,
project="OBS6",
)
obs += select_metadata(
input_data,
variable_group=var_prep,
project="obs4MIPs",
)
models += select_metadata(
input_data,
variable_group=var_prep,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,11 @@ def main(cfg):
variable_group=var_prep,
project="OBS6",
)
obs += select_metadata(
input_data,
variable_group=var_prep,
project="obs4MIPs",
)
models += select_metadata(
input_data,
variable_group=var_prep,
Expand Down
8 changes: 5 additions & 3 deletions esmvaltool/recipes/recipe_enso_feedback.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,19 +135,21 @@ diagnostics:
mip: Omon
preprocessor: ssh_east
additional_datasets:
- {dataset: CMEMS, project: OBS6, type: sat, tier: 2, version: SEALEVEL-GLO-PHY-L4, start_year: 1993, end_year: 2018}
# can use either of the following obs for zos
# - {dataset: CMEMS, project: OBS6, type: sat, tier: 2, version: SEALEVEL-GLO-PHY-L4, start_year: 1993, end_year: 2018}
- {dataset: AVISO-1-0, project: obs4MIPs, institute: CNES, grid: gn, version: '*', start_year: 1993, end_year: 2010}
ssh_eqp:
short_name: zos
mip: Omon
preprocessor: ssh_eqp
additional_datasets:
- {dataset: CMEMS, project: OBS6, type: sat, tier: 2, version: SEALEVEL-GLO-PHY-L4, start_year: 1993, end_year: 2018}
- {dataset: AVISO-1-0, project: obs4MIPs, institute: CNES, grid: gn, version: '*', start_year: 1993, end_year: 2010}
ssh_eqp_area:
short_name: zos
mip: Omon
preprocessor: ssh_eqp_area
additional_datasets:
- {dataset: CMEMS, project: OBS6, type: sat, tier: 2, version: SEALEVEL-GLO-PHY-L4, start_year: 1993, end_year: 2018}
- {dataset: AVISO-1-0, project: obs4MIPs, institute: CNES, grid: gn, version: '*', start_year: 1993, end_year: 2010}

scripts:
plot_script:
Expand Down
Loading