From 300a3f1bfde702a7f073bdec6a83fe2348d41621 Mon Sep 17 00:00:00 2001 From: Alice Barthel Date: Wed, 11 Sep 2024 09:54:23 -0500 Subject: [PATCH] PR review changes --- mpas_analysis/__main__.py | 0 mpas_analysis/default.cfg | 4 ++-- mpas_analysis/obs/observational_datasets.xml | 25 ++++++++++++++++++-- mpas_analysis/ocean/osnap_transects.py | 6 ++--- 4 files changed, 27 insertions(+), 8 deletions(-) mode change 100755 => 100644 mpas_analysis/__main__.py diff --git a/mpas_analysis/__main__.py b/mpas_analysis/__main__.py old mode 100755 new mode 100644 diff --git a/mpas_analysis/default.cfg b/mpas_analysis/default.cfg index 3a09c622c..2bb06ce16 100644 --- a/mpas_analysis/default.cfg +++ b/mpas_analysis/default.cfg @@ -2624,7 +2624,7 @@ renormalizationThreshold = 0.01 [osnapTemperatureTransects] -## options related to plotting WOCE transects of potential temperature +## options related to plotting OSNAP transects of potential temperature # colormap for model/observations colormapNameResult = RdYlBu_r @@ -2663,7 +2663,7 @@ normArgsDifference = {'vmin': -2.0, 'vmax': 2.0} contourLevelsDifference = np.arange(-1.8, 2.0, 0.4) [osnapSalinityTransects] -## options related to plotting WOCE transects of salinity +## options related to plotting OSNAP transects of salinity # colormap for model/observations colormapNameResult = haline diff --git a/mpas_analysis/obs/observational_datasets.xml b/mpas_analysis/obs/observational_datasets.xml index 22c8554d9..f83819627 100644 --- a/mpas_analysis/obs/observational_datasets.xml +++ b/mpas_analysis/obs/observational_datasets.xml @@ -1212,7 +1212,28 @@ ocean - OSNAP,designed to provide a continuous record of the full-water column, trans-basin fluxes of heat, mass and freshwater in the subpolar North Atlantic,consists oftwo legs: one extending from southern Labrador to the southwestern tip of Greenland across the mouth of the Labrador Sea (OSNAP West), and the second from the southeastern tip of Greenland to Scotland (OSNAP East). The observing system also includes subsurface floats (OSNAP Floats) in order to trace the pathways of overflow waters in the basin and to assess the connectivity of currents crossing the OSNAP line. The location of the OSNAP East and West legs purposefully melds with a number of long-term observational efforts in the North Atlantic: the Canadian repeat AR7W program in the Labrador Sea; the German Labrador Sea western boundary array at 53°N; the global Ocean Observatories Initiative node to be placed in the southwestern Irminger Sea; the repeat A1E/AR7E hydrographic sections across the Irminger and Iceland basins; and the Ellett line in the Rockall region. Importantly, this observing system, in conjunction with the RAPID/MOCHA array at 26ºNand the EU THOR/NACLIM program, will provide a comprehensive measure of the Atlantic Meridional Overturning Circulation (AMOC) and provide a means to evaluate intergyre connectivity in the North Atlantic. OSNAP is a collaborative effort, which includes several countries including US, Canada, China, France, Germany, Netherlands and the UK. + OSNAP was designed to provide a continuous record of the full-water + column, trans-basin fluxes of heat, mass and freshwater in the subpolar + North Atlantic. It consists of two legs: one extending from southern + Labrador to the southwestern tip of Greenland across the mouth of the + Labrador Sea (OSNAP West), and the second from the southeastern tip of + Greenland to Scotland (OSNAP East). The observing system also includes + subsurface floats (OSNAP Floats) in order to trace the pathways of + overflow waters in the basin and to assess the connectivity of currents + crossing the OSNAP line. The location of the OSNAP East and West legs + purposefully melds with a number of long-term observational efforts in + the North Atlantic: the Canadian repeat AR7W program in the Labrador + Sea; the German Labrador Sea western boundary array at 53°N; the global + Ocean Observatories Initiative node to be placed in the southwestern + Irminger Sea; the repeat A1E/AR7E hydrographic sections across the + Irminger and Iceland basins; and the Ellett line in the Rockall region. + Importantly, this observing system, in conjunction with the RAPID/MOCHA + array at 26ºN and the EU THOR/NACLIM program, will provide a + comprehensive measure of the Atlantic Meridional Overturning Circulation + (AMOC) and provide a means to evaluate intergyre connectivity in the + North Atlantic. OSNAP is a collaborative effort, which includes several + countries including US, Canada, China, France, Germany, Netherlands and + the UK. [Overturning in the Subpolar North Atlantic Program (OSNAP) website] @@ -1229,7 +1250,7 @@ - https://duke.app.box.com/s/4qbi9ocpvmxdv44wnx2g5rgoyy85jmz6 - - preprocess_observations/preprocess_OSNAP30day_data.bash + - preprocess_observations/preprocessingOSNAP30day.ipynb - climatologyMapOSNAP diff --git a/mpas_analysis/ocean/osnap_transects.py b/mpas_analysis/ocean/osnap_transects.py index 967712dfa..c04d5801b 100644 --- a/mpas_analysis/ocean/osnap_transects.py +++ b/mpas_analysis/ocean/osnap_transects.py @@ -16,8 +16,6 @@ from mpas_analysis.shared.io.utility import build_obs_path -from collections import OrderedDict - class OsnapTransects(AnalysisTask): """ @@ -42,12 +40,12 @@ def __init__(self, config, mpasClimatologyTask, controlConfig=None): The task that produced the climatology to be remapped and plotted as a transect - controlconfig : mpas_tools.config.MpasConfigParser, optional + controlConfig : mpas_tools.config.MpasConfigParser, optional Configuration options for a control run (if any) """ # Authors # ------- - # Xylar Asay-Davis + # Alice Barthel tags = ['climatology', 'transect', 'osnap', 'publicObs', 'arctic']