From 889cdb4a6a28a991db5321b7cdf3a40af151b8f5 Mon Sep 17 00:00:00 2001 From: David Bailey Date: Mon, 27 Jan 2025 10:11:00 -0700 Subject: [PATCH 1/3] Update notebooks to use grid_file and path_nsidc --- examples/coupled_model/config.yml | 4 ++++ nblibrary/ice/Hemis_seaice_visual_compare_contour.ipynb | 4 +++- nblibrary/ice/Hemis_seaice_visual_compare_obs_lens.ipynb | 8 +++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/examples/coupled_model/config.yml b/examples/coupled_model/config.yml index 2d46a7e..91c080d 100644 --- a/examples/coupled_model/config.yml +++ b/examples/coupled_model/config.yml @@ -158,10 +158,14 @@ compute_notebooks: parameter_groups: none: climo_nyears: 35 + grid_file: '/glade/campaign/cesm/community/omwg/grids/tx2_3v2_grid.nc' + path_nsidc: '/glade/campaign/cesm/development/cross-wg/diagnostic_framework/CUPiD_obs_data/ice/analysis_datasets/hemispheric_data/NSIDC_SeaIce_extent' Hemis_seaice_visual_compare_contour: parameter_groups: none: climo_nyears: 35 + grid_file: '/glade/campaign/cesm/community/omwg/grids/tx2_3v2_grid.nc' + path_nsidc: '/glade/campaign/cesm/development/cross-wg/diagnostic_framework/CUPiD_obs_data/ice/analysis_datasets/hemispheric_data/NSIDC_SeaIce_extent' ########### JUPYTER BOOK CONFIG ########### diff --git a/nblibrary/ice/Hemis_seaice_visual_compare_contour.ipynb b/nblibrary/ice/Hemis_seaice_visual_compare_contour.ipynb index a1404ac..bf53d51 100644 --- a/nblibrary/ice/Hemis_seaice_visual_compare_contour.ipynb +++ b/nblibrary/ice/Hemis_seaice_visual_compare_contour.ipynb @@ -64,6 +64,8 @@ "base_end_date = \"0100-01-01\"\n", "\n", "climo_nyears = 35\n", + "grid_file = \"/glade/campaign/cesm/community/omwg/grids/tx2_3v2_grid.nc\"\n", + "path_nsidc = \"/glade/campaign/cesm/development/cross-wg/diagnostic_framework/CUPiD_obs_data/ice/analysis_datasets/hemispheric_data/NSIDC_SeaIce_extent\"\n", "\n", "lc_kwargs = {}\n", "\n", @@ -163,7 +165,7 @@ " coords=\"minimal\",\n", ").sel(time=slice(base_start_date, base_end_date))\n", "\n", - "ds_grid = xr.open_dataset(\"/glade/campaign/cesm/community/omwg/grids/tx2_3v2_grid.nc\")\n", + "ds_grid = xr.open_dataset(grid_file)\n", "TLAT = ds_grid[\"TLAT\"]\n", "TLON = ds_grid[\"TLONG\"]\n", "tarea = ds_grid[\"TAREA\"] * 1.0e-4\n", diff --git a/nblibrary/ice/Hemis_seaice_visual_compare_obs_lens.ipynb b/nblibrary/ice/Hemis_seaice_visual_compare_obs_lens.ipynb index 29f03cc..3ccf634 100644 --- a/nblibrary/ice/Hemis_seaice_visual_compare_obs_lens.ipynb +++ b/nblibrary/ice/Hemis_seaice_visual_compare_obs_lens.ipynb @@ -66,6 +66,8 @@ "base_end_date = \"0101-01-01\"\n", "\n", "climo_nyears = 35\n", + "grid_file = \"/glade/campaign/cesm/community/omwg/grids/tx2_3v2_grid.nc\"\n", + "path_nsidc = \"/glade/campaign/cesm/development/cross-wg/diagnostic_framework/CUPiD_obs_data/ice/analysis_datasets/hemispheric_data/NSIDC_SeaIce_extent\"\n", "\n", "lc_kwargs = {}\n", "\n", @@ -165,7 +167,7 @@ " coords=\"minimal\",\n", ").sel(time=slice(base_start_date, base_end_date))\n", "\n", - "ds_grid = xr.open_dataset(\"/glade/campaign/cesm/community/omwg/grids/tx2_3v2_grid.nc\")\n", + "ds_grid = xr.open_dataset()\n", "TLAT = ds_grid[\"TLAT\"]\n", "TLON = ds_grid[\"TLONG\"]\n", "tarea = ds_grid[\"TAREA\"] * 1.0e-4\n", @@ -340,8 +342,6 @@ "source": [ "### Read in the NSIDC data from files\n", "\n", - "path_nsidc = \"/glade/campaign/cesm/development/pcwg/ice/data/NSIDC_SeaIce_extent/\"\n", - "\n", "jan_nsidc = pd.read_csv(path_nsidc + \"N_01_extent_v3.0.csv\", na_values=[\"-99.9\"])\n", "feb_nsidc = pd.read_csv(path_nsidc + \"N_02_extent_v3.0.csv\", na_values=[\"-99.9\"])\n", "mar_nsidc = pd.read_csv(path_nsidc + \"N_03_extent_v3.0.csv\", na_values=[\"-99.9\"])\n", @@ -416,8 +416,6 @@ "source": [ "### Read in the SH NSIDC data from files\n", "\n", - "path_nsidc = \"/glade/campaign/cesm/development/pcwg/ice/data/NSIDC_SeaIce_extent/\"\n", - "\n", "jan_nsidc_sh = pd.read_csv(path_nsidc + \"S_01_extent_v3.0.csv\", na_values=[\"-99.9\"])\n", "feb_nsidc_sh = pd.read_csv(path_nsidc + \"S_02_extent_v3.0.csv\", na_values=[\"-99.9\"])\n", "mar_nsidc_sh = pd.read_csv(path_nsidc + \"S_03_extent_v3.0.csv\", na_values=[\"-99.9\"])\n", From d68d3627713809ef5e5871c951ce98fe8f4b3300 Mon Sep 17 00:00:00 2001 From: David Bailey Date: Tue, 28 Jan 2025 10:02:15 -0700 Subject: [PATCH 2/3] Remove path_nsidc from contour plots for now --- examples/coupled_model/config.yml | 1 - nblibrary/ice/Hemis_seaice_visual_compare_contour.ipynb | 1 - 2 files changed, 2 deletions(-) diff --git a/examples/coupled_model/config.yml b/examples/coupled_model/config.yml index 91c080d..1a581e2 100644 --- a/examples/coupled_model/config.yml +++ b/examples/coupled_model/config.yml @@ -165,7 +165,6 @@ compute_notebooks: none: climo_nyears: 35 grid_file: '/glade/campaign/cesm/community/omwg/grids/tx2_3v2_grid.nc' - path_nsidc: '/glade/campaign/cesm/development/cross-wg/diagnostic_framework/CUPiD_obs_data/ice/analysis_datasets/hemispheric_data/NSIDC_SeaIce_extent' ########### JUPYTER BOOK CONFIG ########### diff --git a/nblibrary/ice/Hemis_seaice_visual_compare_contour.ipynb b/nblibrary/ice/Hemis_seaice_visual_compare_contour.ipynb index 17bd0a9..a7a9f61 100644 --- a/nblibrary/ice/Hemis_seaice_visual_compare_contour.ipynb +++ b/nblibrary/ice/Hemis_seaice_visual_compare_contour.ipynb @@ -65,7 +65,6 @@ "\n", "climo_nyears = 35\n", "grid_file = \"/glade/campaign/cesm/community/omwg/grids/tx2_3v2_grid.nc\"\n", - "path_nsidc = \"/glade/campaign/cesm/development/cross-wg/diagnostic_framework/CUPiD_obs_data/ice/analysis_datasets/hemispheric_data/NSIDC_SeaIce_extent\"\n", "\n", "lc_kwargs = {}\n", "\n", From 59f32ab7bc28b38509d6ffca473372ab74bbd49a Mon Sep 17 00:00:00 2001 From: David Bailey Date: Tue, 28 Jan 2025 13:20:21 -0700 Subject: [PATCH 3/3] Fix redundant use of grid_file and path_nsidc --- nblibrary/ice/Hemis_seaice_visual_compare_obs_lens.ipynb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nblibrary/ice/Hemis_seaice_visual_compare_obs_lens.ipynb b/nblibrary/ice/Hemis_seaice_visual_compare_obs_lens.ipynb index 450d8e8..33dedb2 100644 --- a/nblibrary/ice/Hemis_seaice_visual_compare_obs_lens.ipynb +++ b/nblibrary/ice/Hemis_seaice_visual_compare_obs_lens.ipynb @@ -74,10 +74,7 @@ "\n", "lc_kwargs = {}\n", "\n", - "hist = 0\n", - "\n", - "path_nsidc = \"/glade/campaign/cesm/development/pcwg/ice/data/NSIDC_SeaIce_extent\"\n", - "grid_file = \"/glade/campaign/cesm/community/omwg/grids/tx2_3v2_grid.nc\"" + "hist = 0" ] }, {