From 5b32a8dad016b5e09fd62900cd20d68c4b363d92 Mon Sep 17 00:00:00 2001 From: Roberto Bilbao Date: Wed, 18 Dec 2019 15:24:50 +0100 Subject: [PATCH 1/3] Add more regions --- new_masks/basins.yml | 16 +++++++++++++++- new_masks/create_basins_mask.py | 5 +++-- new_masks/load_modules.txt | 4 ++++ 3 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 new_masks/load_modules.txt diff --git a/new_masks/basins.yml b/new_masks/basins.yml index 201d6fe..e05fc45 100644 --- a/new_masks/basins.yml +++ b/new_masks/basins.yml @@ -165,6 +165,9 @@ basins: - {lat: [48.5, 52], lon: [-57, -50]} - {lat: [50, 51], lon: [-56, -50]} - {lat: [47.5, 50], lon: [-56, -51]} + + Labrador_Sea_conv: + - {lat: [55, 65], lon: [-56, -46]} Irminger_Sea: - {lat: [58.3, 67.5], lon: [-46, -40]} @@ -432,7 +435,18 @@ basins: AMV_North_Atlantic: - {lat: [0, 60], lon:[-80, 0]} + + AMV_North_Atlantic2: + - {lat: [30, 60], lon:[-80, 0]} AMV_trend: - {lat: [-60, 60], lon: [-180, 180]} - \ No newline at end of file + + Subpolar_Gyre_Box: + - {lat: [50, 65], lon:[-60, 0]} + + East_Subpolar_Gyre_Box: + - {lat: [50, 65], lon:[-60, -30]} + + West_Subpolar_Gyre_Box: + - {lat: [50, 65], lon:[-30, 0]} \ No newline at end of file diff --git a/new_masks/create_basins_mask.py b/new_masks/create_basins_mask.py index 0f48da3..f2a3a72 100644 --- a/new_masks/create_basins_mask.py +++ b/new_masks/create_basins_mask.py @@ -179,5 +179,6 @@ def intersection(mask1, mask2): if __name__ == "__main__": mesh_path = "/esarchive/autosubmit/con_files" - # create_mask(mesh_path, 'Ec3.2_O1L75') - create_mask(mesh_path, 'Ec3.2_O25L75') + #mesh_path = "/esarchive/scratch/Earth/rfernand/con_files" + create_mask(mesh_path, 'Ec3.2_O1L75') + #create_mask(mesh_path, 'Ec3.2_O25L75') diff --git a/new_masks/load_modules.txt b/new_masks/load_modules.txt new file mode 100644 index 0000000..b416194 --- /dev/null +++ b/new_masks/load_modules.txt @@ -0,0 +1,4 @@ +module load earthdiagnostics/3.1.1-foss-2015a-Python-3.7.3 +module load CDO/1.5.3-foss-2015a +module load Iris/2.2.1-foss-2015a-Python-3.7.3 +module load numba/0.44.1-foss-2015a-Python-3.7.3 -- GitLab From 093dcfeeae582330c715eda268ebf53628b66c65 Mon Sep 17 00:00:00 2001 From: Roberto Bilbao Date: Fri, 6 Mar 2020 12:38:00 +0100 Subject: [PATCH 2/3] add more regios --- new_masks/basins.yml | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/new_masks/basins.yml b/new_masks/basins.yml index e05fc45..16f5644 100644 --- a/new_masks/basins.yml +++ b/new_masks/basins.yml @@ -166,9 +166,6 @@ basins: - {lat: [50, 51], lon: [-56, -50]} - {lat: [47.5, 50], lon: [-56, -51]} - Labrador_Sea_conv: - - {lat: [55, 65], lon: [-56, -46]} - Irminger_Sea: - {lat: [58.3, 67.5], lon: [-46, -40]} - {lat: [60, 67.5], lon: [-40, -35]} @@ -434,9 +431,11 @@ basins: - {lat: [-5, 5], lon: [160, 180]} AMV_North_Atlantic: + - {basin: Atlantic_Ocean} - {lat: [0, 60], lon:[-80, 0]} AMV_North_Atlantic2: + - {basin: Atlantic_Ocean} - {lat: [30, 60], lon:[-80, 0]} AMV_trend: @@ -445,8 +444,32 @@ basins: Subpolar_Gyre_Box: - {lat: [50, 65], lon:[-60, 0]} - East_Subpolar_Gyre_Box: + West_Subpolar_Gyre_Box: - {lat: [50, 65], lon:[-60, -30]} - West_Subpolar_Gyre_Box: - - {lat: [50, 65], lon:[-30, 0]} \ No newline at end of file + East_Subpolar_Gyre_Box: + - {lat: [50, 65], lon:[-30, 0]} + + Pacific_TPI1: + - {lat: [25, 45], lon:[140, 180]} + - {lat: [25, 45], lon:[-180, -145]} + + Pacific_TPI2: + - {lat: [-10, 10], lon:[170, 180]} + - {lat: [-10, 10], lon:[-180, -90]} + + Pacific_TPI3: + - {lat: [-50, -15], lon:[150, 180]} + - {lat: [-50, -15], lon:[-180, -160]} + + Indian_dipole_west: + - {lat: [-10, 10], lon:[50,70]} + + Indian_dipole_east: + - {lat: [-10, 0], lon:[90, 110]} + + Labrador_Sea_conv: + - {lat: [55, 65], lon: [-56, -46]} + + Labrador_Sea_conv2: + - {lat: [52, 65], lon: [-58, -43]} -- GitLab From 873c55e6589e5980c620827a8de1398efa3f05c6 Mon Sep 17 00:00:00 2001 From: Javier Vegas-Regidor Date: Fri, 6 Mar 2020 12:56:05 +0100 Subject: [PATCH 3/3] Add version and grid attributes to file --- new_masks/basins.yml | 12 +++++++----- new_masks/create_basins_mask.py | 9 +++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/new_masks/basins.yml b/new_masks/basins.yml index 16f5644..0dfd98d 100644 --- a/new_masks/basins.yml +++ b/new_masks/basins.yml @@ -1,3 +1,5 @@ +version: 1 + basins: Global_Ocean: - {lat: [-90, 90], lon: [-180, 180]} @@ -165,7 +167,7 @@ basins: - {lat: [48.5, 52], lon: [-57, -50]} - {lat: [50, 51], lon: [-56, -50]} - {lat: [47.5, 50], lon: [-56, -51]} - + Irminger_Sea: - {lat: [58.3, 67.5], lon: [-46, -40]} - {lat: [60, 67.5], lon: [-40, -35]} @@ -429,7 +431,7 @@ basins: Nino4: - {lat: [-5, 5], lon: [-180, -150]} - {lat: [-5, 5], lon: [160, 180]} - + AMV_North_Atlantic: - {basin: Atlantic_Ocean} - {lat: [0, 60], lon:[-80, 0]} @@ -437,10 +439,10 @@ basins: AMV_North_Atlantic2: - {basin: Atlantic_Ocean} - {lat: [30, 60], lon:[-80, 0]} - + AMV_trend: - {lat: [-60, 60], lon: [-180, 180]} - + Subpolar_Gyre_Box: - {lat: [50, 65], lon:[-60, 0]} @@ -449,7 +451,7 @@ basins: East_Subpolar_Gyre_Box: - {lat: [50, 65], lon:[-30, 0]} - + Pacific_TPI1: - {lat: [25, 45], lon:[140, 180]} - {lat: [25, 45], lon:[-180, -145]} diff --git a/new_masks/create_basins_mask.py b/new_masks/create_basins_mask.py index f2a3a72..f2b4c6c 100644 --- a/new_masks/create_basins_mask.py +++ b/new_masks/create_basins_mask.py @@ -72,6 +72,8 @@ def create_mask(path, version, config_file=None, plot=False): DimCoord(np.arange(lat.shape[1]), var_name='x'), (2, )) basins.add_dim_coord( DimCoord(np.arange(lat.shape[0]), var_name='y'), (1, )) + basins.attributes['version'] = int(config['version']) + basins.attributes['grid'] = version print('Basins cube:') print(basins) iris.save( @@ -178,7 +180,6 @@ def intersection(mask1, mask2): if __name__ == "__main__": - mesh_path = "/esarchive/autosubmit/con_files" - #mesh_path = "/esarchive/scratch/Earth/rfernand/con_files" - create_mask(mesh_path, 'Ec3.2_O1L75') - #create_mask(mesh_path, 'Ec3.2_O25L75') + MESH_PATH = "/esarchive/autosubmit/con_files" + create_mask(MESH_PATH, 'Ec3.2_O1L75') + create_mask(MESH_PATH, 'Ec3.2_O25L75') -- GitLab