Update regression testing scripts

E3SM-Project · Jan 10, 2025 · 9221c5b · 9221c5b
1 parent 94959cc
commit 9221c5b
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 82 deletions.
diff --git a/..._tools/cdat_regression_testing/843-migration-phase3/run-script-model-vs-obs/run_script.py b/..._tools/cdat_regression_testing/843-migration-phase3/run-script-model-vs-obs/run_script.py
@@ -12,7 +12,7 @@
     Or: source /lcrc/soft/climate/e3sm-unified/load_latest_e3sm_unified_anvil.sh
 
 NERSC perlmutter cpu:
-    salloc --nodes 1 --qos interactive --time 01:00:00 --constraint cpu --account=e3sm
+    salloc --nodes 1 --qos interactive --time 0:00:00 --constraint cpu --account=e3sm
     source /global/common/software/e3sm/anaconda_envs/load_latest_e3sm_unified_pm-cpu.sh
 """
 # flake8: noqa E501
@@ -67,7 +67,9 @@ def run_all_sets():
         "ANN",
         "JJA",
     ]  # Default setting: seasons = ["ANN", "DJF", "MAM", "JJA", "SON"]
-    param.results_dir = "/global/cfs/cdirs/e3sm/www/cdat-migration-fy24/843-migration-phase3-perf-benchmark"
+    param.results_dir = (
+        "/global/cfs/cdirs/e3sm/www/cdat-migration-fy24/25-01-10-907-v2-data-2"
+    )
     param.multiprocessing = True
     param.num_workers = 24
 
@@ -168,7 +170,7 @@ def run_all_sets():
         "area_mean_time_series",
         "diurnal_cycle",
         "streamflow",
-        "arm_diags",
+        # "arm_diags",
         "tc_analysis",
         "aerosol_aeronet",
         "aerosol_budget",

diff --git a/..._regression_testing/906-v2_complete_run/run-script-model-vs-obs/model_vs_obs_netcdf.ipynb b/..._regression_testing/906-v2_complete_run/run-script-model-vs-obs/model_vs_obs_netcdf.ipynb
@@ -37,7 +37,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 44,
+   "execution_count": 63,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -55,7 +55,6 @@
     "DEV_GLOB = sorted(glob.glob(DEV_PATH + \"**/**/*.nc\"))\n",
     "DEV_NUM_FILES = len(DEV_GLOB)\n",
     "\n",
-    "\n",
     "MAIN_DIR = \"main\"\n",
     "MAIN_PATH = f\"/global/cfs/cdirs/e3sm/www/cdat-migration-fy24/{MAIN_DIR}/\"\n",
     "MAIN_GLOB = sorted(glob.glob(MAIN_PATH + \"**/**/*.nc\"))\n",
@@ -110,7 +109,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 45,
+   "execution_count": 64,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -235,7 +234,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 46,
+   "execution_count": 65,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -285,7 +284,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 47,
+   "execution_count": 66,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -294,7 +293,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 48,
+   "execution_count": 67,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -304,7 +303,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 49,
+   "execution_count": 68,
    "metadata": {},
    "outputs": [
     {
@@ -313,7 +312,7 @@
        "(1254, 1248)"
       ]
      },
-     "execution_count": 49,
+     "execution_count": 68,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -324,7 +323,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 50,
+   "execution_count": 69,
    "metadata": {},
    "outputs": [
     {
@@ -357,7 +356,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 51,
+   "execution_count": 70,
    "metadata": {},
    "outputs": [
     {
@@ -373,7 +372,7 @@
        " '/global/cfs/cdirs/e3sm/www/cdat-migration-fy24/main/lat_lon/OMI-MLS/OMI-MLS-TCO-JJA-60S60N_test.nc']"
       ]
      },
-     "execution_count": 51,
+     "execution_count": 70,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -395,7 +394,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 52,
+   "execution_count": 71,
    "metadata": {},
    "outputs": [
     {
@@ -405,7 +404,7 @@
        " '/global/cfs/cdirs/e3sm/www/cdat-migration-fy24/25-01-10-branch-907-v2-data/annual_cycle_zonal_mean/AOD_550/AOD_550-AODVIS-ANNUALCYCLE-global_test.nc']"
       ]
      },
-     "execution_count": 52,
+     "execution_count": 71,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -426,7 +425,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 53,
+   "execution_count": 72,
    "metadata": {},
    "outputs": [
     {

diff --git a/auxiliary_tools/cdat_regression_testing/906-v3_complete_run/12_11_24_lat-lon_diffs.py b/auxiliary_tools/cdat_regression_testing/906-v3_complete_run/12_11_24_lat-lon_diffs.py
diff --git a/auxiliary_tools/cdat_regression_testing/906-v3_complete_run/906-diags.cfg b/auxiliary_tools/cdat_regression_testing/906-v3_complete_run/906-diags.cfg
diff --git a/...un/regression-test/complete_run_script.py → ...06-v3_complete_run/complete_run_script.py b/...un/regression-test/complete_run_script.py → ...06-v3_complete_run/complete_run_script.py
diff --git a/...e_run/regression-test/regression_nc.ipynb → ...g/906-v3_complete_run/regression_nc.ipynb b/...e_run/regression-test/regression_nc.ipynb → ...g/906-v3_complete_run/regression_nc.ipynb
diff --git a/..._run/regression-test/regression_png.ipynb → .../906-v3_complete_run/regression_png.ipynb b/..._run/regression-test/regression_png.ipynb → .../906-v3_complete_run/regression_png.ipynb