Merge pull request #124 from valeriupredoi/compare_linestyle

A series of minor changes, mostly new yml files

bgcval2/analysis_compare.py

@@ -507,6 +507,7 @@ def load_comparison_yml(master_compare_yml_fn):
     details['do_analysis_timeseries'] = input_yml_dict.get('do_analysis_timeseries', False)
     details['do_mass_download'] = input_yml_dict.get('do_mass_download', False)
     details['master_suites'] = input_yml_dict.get('master_suites', [])
+    details['strictFileCheck'] = input_yml_dict.get('strict_file_check', True)
 
     # Image output settings:
     # dpi: pixels per inch (image resolution)

bgcval2/download_from_mass.py

@@ -442,6 +442,8 @@ def download_from_mass(
     header_lines.append(''.join(['# run script with:\n# source ', os.path.abspath(download_script_path),'\n']))
     header_lines.append('# moo passwd -r # if mass password is expired\n')
     header_lines.append('source /etc/bashrc\n') # make sure script can access moo tools.
+    header_lines.append('echo "\n\nDownloading '+jobID+' on mass-cli1"\n') # make sure script can access moo tools.
+
     download_script_txt = ''.join(header_lines)
 
     # moo ls:

input_yml/TerraFIRMA_en1_reversible.yml

@@ -0,0 +1,80 @@
+---
+# GC5 N96 ORCA1 spinup analysis
+name: TerraFIRMA_en1_reversible
+
+# Run the single job analysis
+do_analysis_timeseries: True 
+
+# Download from mass:
+do_mass_download: False
+
+# master analysis suite
+master_suites: physics
+
+clean: True
+
+jobs:
+    u-cy837:
+       description: '1.5C branch'
+       colour: purple  
+       thickness: 1.7
+       linestyle: '-'
+       shifttime: 0.
+       suite: kmf physics
+
+    u-cy838: 
+       description: '2.0C branch'
+       colour: violet
+       thickness: 1.7
+       linestyle: '-'
+       shifttime: 0.
+       suite: kmf physics
+
+    u-cz374:
+       description: '2.5C branch'
+       colour: blue
+       thickness: 1.7
+       linestyle: '-'
+       shifttime: 0.
+       suite: kmf physics
+
+    u-cz375:
+       description: '3.0C branch'
+       colour: cyan
+       thickness: 1.7
+       linestyle: '-'
+       shifttime: 0.
+       suite: kmf physics
+
+    u-cz376:
+       description: '4.0C branch'
+       colour: green
+       thickness: 1.7
+       linestyle: '-'
+       shifttime: 0.
+       suite: kmf physics
+
+    u-cz377:
+       description: '5.0C branch'
+       colour: goldenrod
+       thickness: 1.7
+       linestyle: '-'
+       shifttime: 0.
+       suite: kmf physics
+
+    u-cx209:
+       description: 'Ramp up'
+       colour: 'red'
+       thickness: 0.6
+       linestyle: '-'
+       shifttime: 0.
+       suite: kmf physics
+
+    u-cs495:
+       description: 'piControl'
+       colour: 'black'
+       thickness: 0.6
+       linestyle: '-'
+       shifttime: -100.
+       suite: kmf physics
+

input_yml/TerraFIRMA_overshoot_historical_debug.yml

@@ -0,0 +1,28 @@
+---
+# GC5 N96 ORCA1 spinup analysis
+name: TerraFIRMA_overshoot_historical_debug
+
+# Run the single job analysis
+do_analysis_timeseries: True 
+
+# Download from mass:
+do_mass_download: False
+
+# master analysis suite
+master_suites: physics bgc #alkalinity physics kmf1
+
+clean: True
+
+jobs:
+    u-cy693:
+       description: ' static ice sheets, started from picontrol yr 2317'
+       colour: goldenrod
+       thickness: 1.7
+       linestyle: '-'
+       shifttime: 0.
+       suite: kmf physics bgc #alkalinity physics kmf
+
+
+
+
+

input_yml/TerraFIRMA_overshoot_pi_stablilisation.yml

@@ -0,0 +1,90 @@
+---
+# GC5 N96 ORCA1 spinup analysis
+name: TerraFIRMA_overshoot_pi_stabilization_2023
+
+# Run the single job analysis
+do_analysis_timeseries: True 
+
+# Download from mass:
+do_mass_download: False
+
+# master analysis suite
+master_suites: physics #bgc #alkalinity physics kmf1
+
+clean: True
+
+#           u-cp530: CO2 conc mode, interactive ice but fixed ice geometry (red)
+#           u-cs495: CO2 emission mode, interactive ice but fixed ice geometry (green) 
+#           u-cp345: CO2 conc mode, interactive ice and interactive (variable) ice geometry (blue)
+
+# Job ID's suites as named by Rose/Cylc
+# •     u-co094 - no alk added
+# •     u-cp800 - alk add at surface
+# •     u-cp799 - alk added at bathy - or 100m (if bathy deeper)
+# •     u-cn857 - alk added at bathy - or 200m (if bathy deeper)
+#
+jobs:
+#    u-by230:
+#       description: 'UKESM1.1 piControl (abridged)'
+#       colour: 'black'
+#       thickness: 0.6
+#       linestyle: '-'
+#       shifttime: -1000.
+#       timerange: [1900, 2000]
+#       suite: physics bgc #alkalinity physics
+
+#    u-cs568:
+#       description: 'TF overshoot piControl variant #1'
+#       colour: red  
+#       thickness: 1.7
+#       linestyle: '-'
+#       shifttime: 0.
+#       suite: physics bgc #alkalinity physics
+
+#    u-cp530: 
+#       description: 'TF overshoot piControl variant #4 conc mode, interactive ice but fixed ice geometry'
+#       colour: purple
+#       thickness: 1.7
+#       linestyle: '-'
+#       shifttime: 0.
+#       suite: physics bgc #alkalinity physics
+
+
+
+#   u-cp345:
+#      description: 'TF overshoot piControl variant #2 CO2 conc mode, interactive ice and interactive (variable) ice geometry'
+#      colour: blue
+#      thickness: 1.7
+#      linestyle: '-'
+#      shifttime: 0.
+#      suite: physics bgc #alkalinity physics
+
+
+    u-cs495:
+       description: 'TF overshoot piControl variant #3 CO2 emission mode, interactive ice but fixed ice geometry'
+       colour: green
+       thickness: 1.7
+       linestyle: '-'
+       shifttime: 0.
+       suite: physics  bgc #alkalinity physics kmf
+
+    u-cs772:
+       description: 'TF overshoot ramp-up +10GtC/yr'
+       colour: blue 
+       thickness: 1.7
+       linestyle: '-'
+       shifttime: 0.
+       suite: physics  #bgc #alkalinity physics kmf
+
+    u-cv996:
+       description: 'TF overshoot 2C stabilization'
+       colour: purple
+       thickness: 1.7
+       linestyle: '-'
+       shifttime: 0.
+       suite: physics  #bgc #alkalinity physics kmf
+
+
+
+
+

input_yml/TerraFIRMA_overshoot_pi_stablilisation_report_only.yml

@@ -0,0 +1,89 @@
+---
+# GC5 N96 ORCA1 spinup analysis
+name: TerraFIRMA_overshoot_pi_stabilization_2023
+
+# Run the single job analysis
+do_analysis_timeseries: False
+
+# Download from mass:
+do_mass_download: False
+
+# master analysis suite
+master_suites: physics #bgc #alkalinity physics kmf1
+
+clean: True
+
+#           u-cp530: CO2 conc mode, interactive ice but fixed ice geometry (red)
+#           u-cs495: CO2 emission mode, interactive ice but fixed ice geometry (green) 
+#           u-cp345: CO2 conc mode, interactive ice and interactive (variable) ice geometry (blue)
+
+# Job ID's suites as named by Rose/Cylc
+# •     u-co094 - no alk added
+# •     u-cp800 - alk add at surface
+# •     u-cp799 - alk added at bathy - or 100m (if bathy deeper)
+# •     u-cn857 - alk added at bathy - or 200m (if bathy deeper)
+#
+jobs:
+#    u-by230:
+#       description: 'UKESM1.1 piControl (abridged)'
+#       colour: 'black'
+#       thickness: 0.6
+#       linestyle: '-'
+#       shifttime: -1000.
+#       timerange: [1900, 2000]
+#       suite: physics bgc #alkalinity physics
+
+#    u-cs568:
+#       description: 'TF overshoot piControl variant #1'
+#       colour: red  
+#       thickness: 1.7
+#       linestyle: '-'
+#       shifttime: 0.
+#       suite: physics bgc #alkalinity physics
+
+#    u-cp530: 
+#       description: 'TF overshoot piControl variant #4 conc mode, interactive ice but fixed ice geometry'
+#       colour: purple
+#       thickness: 1.7
+#       linestyle: '-'
+#       shifttime: 0.
+#       suite: physics bgc #alkalinity physics
+
+
+
+#   u-cp345:
+#      description: 'TF overshoot piControl variant #2 CO2 conc mode, interactive ice and interactive (variable) ice geometry'
+#      colour: blue
+#      thickness: 1.7
+#      linestyle: '-'
+#      shifttime: 0.
+#      suite: physics bgc #alkalinity physics
+
+    u-cs495:
+       description: 'TF overshoot piControl variant #3 CO2 emission mode, interactive ice but fixed ice geometry'
+       colour: green
+       thickness: 1.7
+       linestyle: '-'
+       shifttime: 0.
+       suite: physics  bgc #alkalinity physics kmf
+
+    u-cs772:
+       description: 'TF overshoot piControl variant #?'
+       colour: blue 
+       thickness: 1.7
+       linestyle: '-'
+       shifttime: 0.
+       suite: physics  #bgc #alkalinity physics kmf
+
+    u-cv996:
+       description: 'TF overshoot piControl variant #?'
+       colour: purple
+       thickness: 1.7
+       linestyle: '-'
+       shifttime: 0.
+       suite: physics  #bgc #alkalinity physics kmf
+
+
+
+
+