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
2 changes: 1 addition & 1 deletion FACTS.py
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ def IdentifyClimateOutputFiles(pcfg,pipe_name):
tcfg = pcfg[this_stage][this_task]
if "climate_output_data" in tcfg.keys():
for this_file in tcfg['climate_output_data']:
if this_file.__contains__('climate.nc'):
if (this_file.__contains__('climate.nc') or this_file.__contains__('climate.h5')):
pd['climate'] = '$SHARED/climate/' + mvar_replace_dict(mvar_dict, this_file)
elif this_file.__contains__('gsat.nc'):
pd['gsat'] = '$SHARED/climate/' + mvar_replace_dict(mvar_dict, this_file)
Expand Down
10 changes: 3 additions & 7 deletions experiments/ebm3.global/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@ climate_step:
fair2:
module_set: "fair2"
module: "climate"
pipeline_file: 'pipeline.yml'
# input_data_file:
# - "ebm3.global.fair2.fair2.climate_ohc.nc"
# - "ebm3.global.fair2.fair2.climate_gsat.nc"
# - "ebm3.global.fair2.fair2.climate_climate.nc"
pipeline_file: 'pipeline.global.yml'
climate_output_data:
- "ebm3.global.fair2.fair2.climate_ohc.nc"
- "ebm3.global.fair2.fair2.climate_gsat.nc"
Expand All @@ -24,6 +20,6 @@ climate_step:
generates_climate_output: true

sealevel_step:
ebm3:
ocean:
module_set: "ebm3"
module: "thermalexpansion"
module: "sterodynamics"
25 changes: 25 additions & 0 deletions experiments/ebm3.local/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
global-options:
nsamps: 50
scenario: ssp585
pyear_start: 2020
pyear_end: 2150
pyear_step: 10
baseyear: 2005
pipeline_file: "pipeline.yml"

climate_step:
fair2:
module_set: "fair2"
module: "climate"
pipeline_file: 'pipeline.yml'
climate_output_data:
- "ebm3.local.fair2.fair2.climate_ohc.nc"
- "ebm3.local.fair2.fair2.climate_gsat.nc"
- "ebm3.local.fair2.fair2.climate_climate.nc"
- "ebm3.local.fair2.fair2.climate_oceantemp.nc"
generates_climate_output: true

sealevel_step:
ocean:
module_set: "ebm3"
module: "sterodynamics"
26 changes: 26 additions & 0 deletions experiments/emulandice2.protect.ssp585/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
global-options:
nsamps: 2237
scenario: ssp585
pyear_start: 2020
pyear_end: 2300 #2150
pyear_step: 10
baseyear: 2005
pipeline_file: "pipeline.2300.yml" # "pipeline.yml"

climate_step:
temperature:
module_set: "fair"
module: "temperature"
pipeline_file: "pipeline.global.yml"
generates_climate_output: true

sealevel_step:
emuAIS:
module_set: "emulandice2"
module: "AIS"
emuGLA:
module_set: "emulandice2"
module: "glaciers"
emuGIS:
module_set: "emulandice2"
module: "GrIS"
2 changes: 1 addition & 1 deletion modules-data/modules-data.global_only.urls.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ https://zenodo.org/record/7478192/files/larmip_icesheet_project_data.tgz
https://zenodo.org/record/7478192/files/ssp_landwaterstorage_preprocess_data.tgz
https://zenodo.org/record/7478192/files/tlm_sterodynamics_preprocess_data.tgz
https://zenodo.org/records/11506798/files/fair2_climate_project_data.tgz
https://zenodo.org/records/11506798/files/ebm3_thermal_expansion_data.tgz
https://zenodo.org/records/16024082/files/ebm3_project_data.tgz
2 changes: 2 additions & 0 deletions modules-data/modules-data.urls.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@ https://zenodo.org/records/11506798/files/fair2_climate_project_data.tgz
https://zenodo.org/records/11506798/files/ebm3_thermal_expansion_data.tgz
https://zenodo.org/records/18199757/files/oelsmann24_vlm_data.tar.gz
https://zenodo.org/records/15975768/files/caron18_GIA_preprocess_data.tgz
https://zenodo.org/records/16024082/files/tlm_sterodynamics_cmip6_ebm3_data.tgz
https://zenodo.org/records/16024082/files/ebm3_project_data.tgz
Loading