Merge pull request #185 from dabail10/seaice

Further plot updates and fix observed contour lines
NCAR · Feb 25, 2025 · 9f80f7e · 9f80f7e
2 parents 0cf7823 + 5f4d3f9
commit 9f80f7e
Show file tree

Hide file tree

Showing 5 changed files with 402 additions and 309 deletions.
diff --git a/examples/coupled_model/config.yml b/examples/coupled_model/config.yml
@@ -49,6 +49,7 @@ global_params:
   end_date: '0100-01-01'
   base_start_date: '0001-01-01'
   base_end_date: '0100-01-01'
+  obs_data_dir: '/glade/campaign/cesm/development/cross-wg/diagnostic_framework/CUPiD_obs_data'
   lc_kwargs:
     threads_per_worker: 1
 
@@ -159,7 +160,7 @@ 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'
+            path_model: '/glade/campaign/cesm/development/cross-wg/diagnostic_framework/CUPiD_model_data/ice/'
       Hemis_seaice_visual_compare_contour:
         parameter_groups:
           none:

diff --git a/examples/key_metrics/config.yml b/examples/key_metrics/config.yml
@@ -172,7 +172,8 @@ compute_notebooks:
           none:
             climo_nyears: 35
             grid_file: '/glade/campaign/cesm/community/omwg/grids/tx2_3v2_grid.nc'
-            path_nsidc: 'ice/analysis_datasets/hemispheric_data/NSIDC_SeaIce_extent'
+            path_model: '/glade/campaign/cesm/development/cross-wg/diagnostic_framework/CUPiD_model_data/ice/'
+
 
     lnd:
       Global_TerrestrialCouplingIndex_VisualCompareObs:

diff --git a/nblibrary/ice/Hemis_seaice_visual_compare_contour.ipynb b/nblibrary/ice/Hemis_seaice_visual_compare_contour.ipynb
@@ -33,7 +33,8 @@
    "source": [
     "import xarray as xr\n",
     "import numpy as np\n",
-    "import yaml"
+    "import yaml\n",
+    "import os"
    ]
   },
   {
@@ -52,22 +53,23 @@
    },
    "outputs": [],
    "source": [
-    "CESM_output_dir = \"/glade/campaign/cesm/development/cross-wg/diagnostic_framework/CESM_output_for_testing\"\n",
-    "serial = False  # use dask LocalCluster\n",
+    "# These parameters are needed when running interactively\n",
+    "\n",
+    "CESM_output_dir = \"\"  # \"/glade/campaign/cesm/development/cross-wg/diagnostic_framework/CESM_output_for_testing\"\n",
     "\n",
-    "case_name = \"b.e30_beta04.BLT1850.ne30_t232_wgx3.121congel\"\n",
-    "base_case_name = \"b.e30_beta04.BLT1850.ne30_t232_wgx3.121\"\n",
+    "case_name = \"\"  # \"b.e30_beta04.BLT1850.ne30_t232_wgx3.121congel\"\n",
+    "base_case_name = \"\"  # \"b.e30_beta04.BLT1850.ne30_t232_wgx3.121\"\n",
     "\n",
-    "start_date = \"0001-01-01\"\n",
-    "end_date = \"0100-01-01\"\n",
-    "base_start_date = \"0001-01-01\"\n",
-    "base_end_date = \"0100-01-01\"\n",
+    "start_date = \"\"  # \"0001-01-01\"\n",
+    "end_date = \"\"  # \"0100-01-01\"\n",
+    "base_start_date = \"\"  # \"0001-01-01\"\n",
+    "base_end_date = \"\"  # \"0100-01-01\"\n",
     "\n",
+    "obs_data_dir = \"\"  # \"/glade/campaign/cesm/development/cross-wg/diagnostic_framework/CUPiD_obs_data\"\n",
+    "grid_file = \"\"  # \"/glade/campaign/cesm/community/omwg/grids/tx2_3v2_grid.nc\"\n",
     "climo_nyears = 35\n",
-    "grid_file = \"/glade/campaign/cesm/community/omwg/grids/tx2_3v2_grid.nc\"\n",
-    "path_nsidc = (\n",
-    "    \"/glade/campaign/cesm/development/cross-wg/diagnostic_framework/CUPiD_obs_data/ice/\"\n",
-    ")\n",
+    "\n",
+    "serial = False  # use dask LocalCluster\n",
     "\n",
     "lc_kwargs = {}"
    ]
@@ -87,6 +89,9 @@
    },
    "outputs": [],
    "source": [
+    "# When running interactively, cupid_run should be set to 0 for\n",
+    "# a DASK cluster\n",
+    "\n",
     "cupid_run = 1\n",
     "\n",
     "if cupid_run == 1:\n",
@@ -176,7 +181,9 @@
     "    cice_masks = yaml.safe_load(file)\n",
     "\n",
     "with open(\"cice_vars.yml\", \"r\") as file:\n",
-    "    cice_vars = yaml.safe_load(file)"
+    "    cice_vars = yaml.safe_load(file)\n",
+    "\n",
+    "path_HadleyOI = os.path.join(obs_data_dir, \"ice\", \"analysis_datasets\", \"1x1d/\")"
    ]
   },
   {
@@ -218,9 +225,20 @@
     "    vmax = cice_vars[var][0][\"levels\"][-1]\n",
     "    levels = np.array(cice_vars[var][0][\"levels\"])\n",
     "    title = cice_vars[var][1][\"title\"]\n",
-    "    field1 = ds1_ann[var].isel(time=slice(-climo_nyears, None)).mean(\"time\").squeeze()\n",
-    "    field2 = ds2_ann[var].isel(time=slice(-climo_nyears, None)).mean(\"time\").squeeze()\n",
-    "    plot_diff(field1, field2, levels, case_name, base_case_name, title, \"N\", TLAT, TLON)"
+    "    field1 = ds1[var].isel(time=slice(-climo_nyears * 12, None))\n",
+    "    field2 = ds2[var].isel(time=slice(-climo_nyears * 12, None))\n",
+    "    plot_diff(\n",
+    "        field1,\n",
+    "        field2,\n",
+    "        levels,\n",
+    "        case_name,\n",
+    "        base_case_name,\n",
+    "        title,\n",
+    "        \"N\",\n",
+    "        TLAT,\n",
+    "        TLON,\n",
+    "        path_HadleyOI,\n",
+    "    )"
    ]
   },
   {
@@ -243,9 +261,20 @@
     "    vmax = cice_vars[var][0][\"levels\"][1]\n",
     "    levels = np.array(cice_vars[var][0][\"levels\"])\n",
     "    title = cice_vars[var][1][\"title\"]\n",
-    "    field1 = ds1_ann[var].isel(time=slice(-climo_nyears, None)).mean(\"time\").squeeze()\n",
-    "    field2 = ds2_ann[var].isel(time=slice(-climo_nyears, None)).mean(\"time\").squeeze()\n",
-    "    plot_diff(field1, field2, levels, case_name, base_case_name, title, \"S\", TLAT, TLON)"
+    "    field1 = ds1[var].isel(time=slice(-climo_nyears * 12, None))\n",
+    "    field2 = ds2[var].isel(time=slice(-climo_nyears * 12, None))\n",
+    "    plot_diff(\n",
+    "        field1,\n",
+    "        field2,\n",
+    "        levels,\n",
+    "        case_name,\n",
+    "        base_case_name,\n",
+    "        title,\n",
+    "        \"S\",\n",
+    "        TLAT,\n",
+    "        TLON,\n",
+    "        path_HadleyOI,\n",
+    "    )"
    ]
   },
   {