Skip to content

Commit

Permalink
First attempt at a shallow merge of VALSO-VALTRANS and VALNA, issue #6.
Browse files Browse the repository at this point in the history
Standard VALSO-VALTRANS metrics and plotting work. VALNA metrics are
calculated but some work to do on the plotting.
  • Loading branch information
DaveStorkey committed Dec 20, 2024
1 parent a70cc81 commit e4fb0be
Show file tree
Hide file tree
Showing 355 changed files with 4,149 additions and 87 deletions.
1 change: 1 addition & 0 deletions ERROR.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
E R R O R in : ./mk_trp.bash u-cl518 19841201 1y (see SLURM/u-cl518/mk_trp_ACC_1y_19841201.out)
Binary file added FIGURES/box_NA.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FIGURES/box_NA_overflows.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FIGURES/box_VALGLO.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FIGURES/box_VALSO.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FIGURES/example_VALSO.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FIGURES/example_VALTRANS.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FIGURES/profiles_scatter_plot.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FIGURES/profiles_timeseries.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FIGURES/shelf_bathymetries.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions FILTERS/filter_grid-T
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--cnk_dmn deptht,1 --cnk_dmn time_counter,1 --cnk_dmn x,200 --cnk_dmn y,200 -v (^thetao$)+,(^thetao_con$)+,(^votemper$)+,(^so$)+,(^so_abs$)+,(^vosaline$)+,(^zos$)+,(^sossheig$)+,(^somxzint1$)+,(^sokaraml$)+,(^hfds$)+,(^sohefldo$)+,(^soicecov$)+
1 change: 1 addition & 0 deletions FILTERS/filter_grid-U
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--cnk_dmn depthu,1 --cnk_dmn time_counter,1 --cnk_dmn x,200 --cnk_dmn y,200 --dfl_lvl 1 -v (^uo$)+,(^vozocrtx$)+,(^e3u$)+,(^thkcello$)+,(^tauuo$)+,(^sozotaux$)+
1 change: 1 addition & 0 deletions FILTERS/filter_grid-V
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--cnk_dmn depthv,1 --cnk_dmn time_counter,1 --cnk_dmn x,200 --cnk_dmn y,200 --dfl_lvl 1 -v (^vo$)+,(^vomecrty$)+,(^e3v$)+,(^thkcello$)+
3 changes: 3 additions & 0 deletions OBS/ACC_bottom_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = Donohue et al, GRL (2016)
mean = 45.6
std = 8.9
3 changes: 3 additions & 0 deletions OBS/ACC_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = Donohue et al, GRL (2016)
mean = 173
std = 11
3 changes: 3 additions & 0 deletions OBS/ACC_shelfbreak_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = Meijers et al, JGR(Oceans) (2016)
mean = 1.5
std = 1.5
4 changes: 4 additions & 0 deletions OBS/AMHT_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ref = RAPID
mean = 1.2
std = 0.1
# 2004-2018
4 changes: 4 additions & 0 deletions OBS/AMOC_max_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ref = RAPID
mean = 17.1
std = 1.5
# 2004-2018 annual av
3 changes: 3 additions & 0 deletions OBS/AMOC_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = L. Jackson
mean = 17.5
std = 2.5
3 changes: 3 additions & 0 deletions OBS/AMU_deepT_mean_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = EN4.2.2.g10 profile data, Good et al (2013), Storkey et al (to be submitted to GMD)
mean = 1.04
std = 0.25
3 changes: 3 additions & 0 deletions OBS/ANT_sie02_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = P. Mathiot
mean = 3
std = 1
3 changes: 3 additions & 0 deletions OBS/ANT_sie09_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = P. Mathiot
mean = 18.5
std = 1.5
3 changes: 3 additions & 0 deletions OBS/ARC_sie03_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = P. Mathiot
mean = 15.3
std = 1.0
3 changes: 3 additions & 0 deletions OBS/ARC_sie09_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = P. Mathiot
mean = 6.3
std = 1
3 changes: 3 additions & 0 deletions OBS/BabElMandeb_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = Xie et al, JGR(Oceans) 124 (2018)
mean = 0.35
std = 0.02
3 changes: 3 additions & 0 deletions OBS/DenmarkStraitLL_obs.txt~
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = P. Mathiot
mean = 175
std = 25
3 changes: 3 additions & 0 deletions OBS/DenmarkStrait_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = Macrander et al GRL, 32 (2005); Aagaard and Malmberg ICES, CM 1978/C:47 (1978); Dickson and Brown, JGR 99 (1994),
mean = 3.2
std = 0.5
3 changes: 3 additions & 0 deletions OBS/DenmarkStrait_obs.txt~
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = D. Storkey
mean = 3.0
std = 1.0
3 changes: 3 additions & 0 deletions OBS/EROSS_deepT_mean_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = EN4.2.2.g10 profile data, Good et al (2013), Storkey et al (to be submitted to GMD)
mean = -1.81
std = 0.09
3 changes: 3 additions & 0 deletions OBS/FaroeBankChannel_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = Hansen et al, Prog Oceanography 75 (2007)
mean = 1.9
std = 0.3
3 changes: 3 additions & 0 deletions OBS/GS_sep_lat_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = EN4 temperature
mean = 37.2
std = 0.4
3 changes: 3 additions & 0 deletions OBS/Gibraltar_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = Soto-Navarro et al, JGR(Oceans) 115 (2010)
mean = 0.78
std = 0.05
3 changes: 3 additions & 0 deletions OBS/HTC_subp_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = EN4
mean = 1.5355417513870916E23
std = 2.2547946295631185E21
4 changes: 4 additions & 0 deletions OBS/LombokStrait_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ref = Sprintall et al, JGR(Oceans) 114 (2009)
mean = 2.6
min = 1.8
max = 3.2
4 changes: 4 additions & 0 deletions OBS/MXL_lab_max_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ref = ifremer dataset 0.03 kg/m3 threshold
mean = -974
std = 0
#1941 - 2002
4 changes: 4 additions & 0 deletions OBS/MXL_lab_mean_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ref = ifremer dataset 0.03 kg/m3 threshold
mean = -489
std = 235
#1941 - 2002
3 changes: 3 additions & 0 deletions OBS/NAC_lat_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = EN4 temperature
mean = 51.2
std = 0.6
3 changes: 3 additions & 0 deletions OBS/NWC_sst_mean_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = P. Mathiot
mean = 12.1
std = 1.
4 changes: 4 additions & 0 deletions OBS/OVF_S_eel_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ref = EEL Xsection from nsv standardiser
mean = 34.95592763
std = 0.01379818
# 15 years, 1996-2017, some years are missing
4 changes: 4 additions & 0 deletions OBS/OVF_S_hansen_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ref = Hansen 2000 from nsv standardiser
mean = 34.90626667
std = 0.
# no time dimen
4 changes: 4 additions & 0 deletions OBS/OVF_S_kogur_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ref = Kogur Xsection from nsv standardiser
mean = 34.88384838
std = 0.00559513
# 2011 sept - 2012 july
4 changes: 4 additions & 0 deletions OBS/OVF_S_latrabjarg_clim_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ref = Latrabjarg from nsv standardiser
mean = 34.84691209
std = 0
# no time series
4 changes: 4 additions & 0 deletions OBS/OVF_S_osnap_icel_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ref = OSNAP from nsv standardiser
mean = 34.933804
std = 0.0020512
# 2014-2016, Icelandic basin only
4 changes: 4 additions & 0 deletions OBS/OVF_S_osnap_irminger_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ref = OSNAP from nsv standardiser
mean = 34.933804
std = 0.0020512
# 2014-2016, Irminger basin only
4 changes: 4 additions & 0 deletions OBS/OVF_S_osnap_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ref = OSNAP from nsv standardiser
mean = 34.947037
std = 0.00142154
# 2014-2016, Irminger and Icelandic basins
4 changes: 4 additions & 0 deletions OBS/OVF_S_ovide_icel_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ref = OVIDE
mean = 34.94983169
std = 0.00509406
# 6 years, 2002-2012, cropped to Icelandic basin
4 changes: 4 additions & 0 deletions OBS/OVF_T_eel_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ref = EEL Xsection from nsv standardiser
mean = 3.21952773
std = 0.11272316
# 15 years, 1996-2017, some years are missing
4 changes: 4 additions & 0 deletions OBS/OVF_T_hansen_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ref = Hansen 2000 from nsv standardiser
mean = 0.05831493
std = 0.
# no time dimen
4 changes: 4 additions & 0 deletions OBS/OVF_T_kogur_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ref = Kogur Xsection from nsv standardiser
mean = 0.35019253
std = 0.08281083
# 2011 sept - 2012 july
4 changes: 4 additions & 0 deletions OBS/OVF_T_latrabjarg_clim_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ref = Latrabjarg from nsv standardiser
mean = 0.69057989
std = 0
# no time series
4 changes: 4 additions & 0 deletions OBS/OVF_T_osnap_icel_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ref = OSNAP from nsv standardiser
mean = 3.03233039
std = 0.0182862
# 2014-2016, Icelandic basin only
4 changes: 4 additions & 0 deletions OBS/OVF_T_osnap_irminger_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ref = OSNAP from nsv standardiser
mean = 2.90767408
std = 0.0308461
# 2014-2016, Irminger basin only
4 changes: 4 additions & 0 deletions OBS/OVF_T_osnap_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ref = OSNAP from nsv standardiser
mean = 2.96945723
std = 0.01964481
# 2014-2016, Irminger and Icelandic basins
4 changes: 4 additions & 0 deletions OBS/OVF_T_ovide_icel_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ref = OVIDE
mean = 2.90064253
std = 0.04285094
# 6 years, 2002-2012, cropped to Icelandic basin
5 changes: 5 additions & 0 deletions OBS/OmbaiStrait_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ref = Sprintall et al, JGR(Oceans) 114 (2009)
mean = 4.9
min = 2.7
max = 5.0

3 changes: 3 additions & 0 deletions OBS/RG_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = Dotto et al, GRL (2018)
mean = 23
std = 8
3 changes: 3 additions & 0 deletions OBS/SO_sst_mean_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = EN4.1.1.g10 (Good et al 2013), climatology for 1950-1954. (Std dev taken from 4.2.2.g10).
mean = 3.6
std = 0.1
3 changes: 3 additions & 0 deletions OBS/SSS_LabSea_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = EN4
mean = 33.97744108143307
std = 0.13480149124388918
3 changes: 3 additions & 0 deletions OBS/SST_newf_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = EN4
mean = 13.90855617900697
std = 0.5102101109813537
3 changes: 3 additions & 0 deletions OBS/SUBP_PSI_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = dummy values
mean =
std =
3 changes: 3 additions & 0 deletions OBS/StraitOfHormuz_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = Vasou et al, Ocean Dynamics (2020)
mean = 0.22
std = 0.01
4 changes: 4 additions & 0 deletions OBS/TimorPassage_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ref = Sprintall et al, JGR(Oceans) 114 (2009)
mean = 7.5
min = 6.2
max = 10.5
3 changes: 3 additions & 0 deletions OBS/WG_karamld_max_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = P. Mathiot
mean = 200
std = 150
3 changes: 3 additions & 0 deletions OBS/WG_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = Klatt et al, Deep-Sea Research II (2005)
mean = 56
std = 8
3 changes: 3 additions & 0 deletions OBS/WROSS_deepS_mean_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = EN4.2.2.g10 profile data, Good et al (2013), Storkey et al (to be submitted to GMD)
mean = 34.83
std = 0.22
3 changes: 3 additions & 0 deletions OBS/WWED_deepS_mean_obs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ref = EN4.2.2.g10 profile data, Good et al (2013), Storkey et al (to be submitted to GMD)
mean = 34.83
std = 0.04
Loading

0 comments on commit e4fb0be

Please sign in to comment.