pre-commit fix

Author: rbeucher

notebooks/Getting_started.ipynb

@@ -811,7 +811,7 @@
     "OCEAN_GRID_FOLDERS = \"output401/ocean/\"  # Specific folder for ocean grid files\n",
     "\n",
     "print(f\"Using dataset from: {ROOT_FOLDER}\")\n",
-    "print(f\"Target folders:\")\n",
+    "print(\"Target folders:\")\n",
     "print(f\"  Atmosphere: {ATMOS_FOLDERS}\")\n",
     "print(f\"  Ocean: {OCEAN_FOLDERS}\")\n",
     "print(f\"  Land: {LAND_FOLDERS}\")\n",
@@ -863,14 +863,14 @@
    "outputs": [],
    "source": [
     "parent_experiment_config = {\n",
-    "    \"parent_experiment_id\": \"piControl-spinup\", # <-- This is for placeholder.\n",
+    "    \"parent_experiment_id\": \"piControl-spinup\",  # <-- This is for placeholder.\n",
     "    \"parent_activity_id\": \"CMIP\",\n",
-    "    \"parent_source_id\": \"ACCESS-ESM1-5\", # <-- ACCESS-ESM1-6 is not yet registered in the CMIP6 catalog, so we use ACCESS-ESM1-5 as a placeholder\n",
+    "    \"parent_source_id\": \"ACCESS-ESM1-5\",  # <-- ACCESS-ESM1-6 is not yet registered in the CMIP6 catalog, so we use ACCESS-ESM1-5 as a placeholder\n",
     "    \"parent_variant_label\": \"r1i1p1f1\",\n",
     "    \"parent_time_units\": \"days since 0001-01-01 00:00:00\",\n",
     "    \"parent_mip_era\": \"CMIP6\",\n",
-    "    \"branch_time_in_child\": 0.0, # <-- This is for placeholder. The actual branch time in child should be the time of the first time step in the input data, converted to the parent time units.\n",
-    "    \"branch_time_in_parent\": 54786.0, # <-- This is the branch time in parent for the December Spin-up run, which is the time of the first time step in the input data (1850-12-01), converted to the parent time units (days since 0001-01-01).\n",
+    "    \"branch_time_in_child\": 0.0,  # <-- This is for placeholder. The actual branch time in child should be the time of the first time step in the input data, converted to the parent time units.\n",
+    "    \"branch_time_in_parent\": 54786.0,  # <-- This is the branch time in parent for the December Spin-up run, which is the time of the first time step in the input data (1850-12-01), converted to the parent time units (days since 0001-01-01).\n",
     "    \"branch_method\": \"standard\",\n",
     "}"
    ]
@@ -904,7 +904,7 @@
     "    input_data=files,\n",
     "    compound_name=\"Amon.rsds\",\n",
     "    experiment_id=\"piControl-spinup\",\n",
-    "    source_id=\"ACCESS-ESM1-5\", # <-- ACCESS-ESM1-6 is not yet registered in the CMIP6 catalog, so we use ACCESS-ESM1-5 as a placeholder\n",
+    "    source_id=\"ACCESS-ESM1-5\",  # <-- ACCESS-ESM1-6 is not yet registered in the CMIP6 catalog, so we use ACCESS-ESM1-5 as a placeholder\n",
     "    variant_label=\"r1i1p1f1\",\n",
     "    grid_label=\"gn\",\n",
     "    activity_id=\"CMIP\",\n",
@@ -1157,9 +1157,7 @@
     "\n",
     "# Find ocean salinity files using the utility function with explicit paths\n",
     "ocean_files = get_monthly_ocean_files(\n",
-    "    \"Omon.so\", \n",
-    "    root_folder=ROOT_FOLDER,\n",
-    "    target_folders=OCEAN_FOLDERS\n",
+    "    \"Omon.so\", root_folder=ROOT_FOLDER, target_folders=OCEAN_FOLDERS\n",
     ")\n",
     "print(f\"Ocean files: {ocean_files[:2]}...\")  # Show first 2 files"
    ]
@@ -1388,7 +1386,7 @@
     "    grid_label=\"gn\",\n",
     "    activity_id=\"CMIP\",\n",
     "    parent_info=parent_experiment_config,\n",
-    "    cmip_version=\"CMIP7\"  # <---- Explicit CMIP7 support (Default is still CMIP6)\n",
+    "    cmip_version=\"CMIP7\",  # <---- Explicit CMIP7 support (Default is still CMIP6)\n",
     ")\n",
     "\n",
     "# Display the CMIP7 variable mapping\n",

src/access_moppy/utilities.py

@@ -145,44 +145,44 @@ def load_model_mappings(compound_name: str, model_id: str = None) -> Dict:
 
 
 def get_monthly_ocean_files(
-    compound_name: str, 
+    compound_name: str,
     root_folder: str = "/g/data/p73/archive/CMIP7/ACCESS-ESM1-6/spinup/Dec25-PI-control/",
     target_folders: str = "output40[0-9]/ocean/",
-    model_id: str = "ACCESS-ESM1.6"
+    model_id: str = "ACCESS-ESM1.6",
 ) -> List[str]:
     """
     Find ocean data files for a given CMOR variable.
-    
-    This utility function searches for ocean model output files that correspond to a 
-    specific CMIP variable by using the variable mapping to identify the required 
+
+    This utility function searches for ocean model output files that correspond to a
+    specific CMIP variable by using the variable mapping to identify the required
     model variables and then searching for files with the ocean-specific naming pattern.
-    
+
     Args:
         compound_name: CMOR compound name (e.g., 'Omon.so', 'Ofx.areacello')
         root_folder: Root directory to search for files (default: ACCESS-ESM1.6 Dec spin-up path)
         target_folders: Target folder pattern relative to root_folder (default: output40[0-9]/ocean/)
         model_id: Model identifier for loading mappings (default: ACCESS-ESM1.6)
-    
+
     Returns:
         List of absolute paths to matching ocean files
-        
+
     Raises:
         ValueError: If compound_name format is invalid
         FileNotFoundError: If root directory doesn't exist
-        
+
     Examples:
         >>> # Find ocean salinity files
         >>> files = get_monthly_ocean_files("Omon.so")
         >>> print(f"Found {len(files)} salinity files")
-        
+
         >>> # Find ocean cell area files (different location)
         >>> area_files = get_monthly_ocean_files(
         ...     "Ofx.areacello",
         ...     target_folders="output401/ocean/"
         ... )
     """
     import glob
-    
+
     # Validate inputs
     if not compound_name or "." not in compound_name:
         raise ValueError(
@@ -247,18 +247,22 @@ def get_monthly_ocean_files(
                     # Only warn if no alternatives were tried
                     warnings.warn(
                         f"No files found for model variable '{model_variable}' with pattern: {search_pattern}",
-                        UserWarning
+                        UserWarning,
                     )
 
             except Exception as e:
-                warnings.warn(f"Error searching for files with pattern '{search_pattern}': {e}")
+                warnings.warn(
+                    f"Error searching for files with pattern '{search_pattern}': {e}"
+                )
 
     # Remove duplicates and sort
     files_found = sorted(list(set(files_found)))
 
     if not files_found:
-        warnings.warn(f"No ocean files found for {compound_name} in {search_pattern_base}")
-    
+        warnings.warn(
+            f"No ocean files found for {compound_name} in {search_pattern_base}"
+        )
+
     return files_found