Enable land only ilamb and global time-series (for J case spin up)

tests/test_zppy_utils.py

@@ -145,7 +145,7 @@ def test_set_component_and_prc_typ():
     c = {"input_component": "mosart"}
     set_component_and_prc_typ(c)
     assert c["component"] == "rof"
-    assert c["prc_typ"] == "sgs"
+    assert c["prc_typ"] == "mosart"
 
     # Test with input_files
     c = {"input_component": "", "input_files": "cam.extension"}
@@ -181,7 +181,7 @@ def test_set_component_and_prc_typ():
     c = {"input_component": "", "input_files": "mosart.extension"}
     set_component_and_prc_typ(c)
     assert c["component"] == "rof"
-    assert c["prc_typ"] == "sgs"
+    assert c["prc_typ"] == "mosart"
 
     # Test error case
     c = {"input_component": "", "input_files": ""}

zppy/global_time_series.py

@@ -97,14 +97,24 @@ def determine_components(c: Dict[str, Any]) -> None:
     c["use_lnd"] = False
     c["use_ocn"] = False
     if c["plots_original"]:
-        c["use_atm"] = True
-        has_original_ocn_plots = (
-            ("change_ohc" in c["plots_original"])
-            or ("max_moc" in c["plots_original"])
-            or ("change_sea_level" in c["plots_original"])
-        )
-        if has_original_ocn_plots:
+        # Define ocean-specific plots that don't require ATM data
+        ocean_plots = {"change_ohc", "max_moc", "change_sea_level"}
+
+        # Parse the plots_original into individual plot names
+        original_plots = set(plot.strip() for plot in c["plots_original"].split(","))
+
+        # Check for ocean plots
+        has_ocean_plots = bool(original_plots & ocean_plots)
+        if has_ocean_plots:
             c["use_ocn"] = True
+
+        # Check for non-ocean plots (ATM plots)
+        non_ocean_plots = original_plots - ocean_plots
+        has_atm_plots = bool(non_ocean_plots)
+
+        # Only require ATM if we have non-ocean plots
+        if has_atm_plots:
+            c["use_atm"] = True
     else:
         # For better string processing in global_time_series.bash
         c["plots_original"] = "None"

zppy/templates/global_time_series.bash

@@ -19,6 +19,25 @@ results_dir_absolute_path={{ scriptDir }}/${results_dir}
 ################################################################################
 case={{ case }}
 www={{ www }}
+case_dir={{ output }}
+
+# Copy ocean results to case directory
+echo
+echo ===== COPY OCEAN RESULTS TO CASE DIRECTORY =====
+echo
+
+if [ -d "${results_dir_absolute_path}/ocn" ]; then
+    mkdir -p ${case_dir}/post/ocn
+    rsync -av ${results_dir_absolute_path}/ocn/ ${case_dir}/post/ocn/
+    if [ $? != 0 ]; then
+        cd {{ scriptDir }}
+        echo 'ERROR (6)' > {{ prefix }}.status
+        exit 6
+    fi
+    echo "Ocean results copied to ${case_dir}/post/ocn/"
+else
+    echo "No ocean results directory found at ${results_dir_absolute_path}/ocn"
+fi
 
 # Copy output to web server
 echo
@@ -49,8 +68,8 @@ do
 done
 {% endif %}
 
-# Copy files
-rsync -a --delete ${results_dir_absolute_path} ${top_level}
+# Copy files (excluding ocn directory)
+rsync -a --delete --exclude='ocn' ${results_dir_absolute_path} ${top_level}
 if [ $? != 0 ]; then
   cd {{ scriptDir }}
   echo 'ERROR (8)' > {{ prefix }}.status
@@ -72,6 +91,17 @@ chmod -R go+rX,go-w ${results_dir}
 popd
 {% endif %}
 
+# Clean up temporary results directory
+echo
+echo ===== CLEANUP TEMPORARY RESULTS DIRECTORY =====
+echo
+rm -rf ${results_dir_absolute_path}
+if [ $? = 0 ]; then
+    echo "Successfully cleaned up ${results_dir_absolute_path}"
+else
+    echo "Warning: Failed to clean up ${results_dir_absolute_path}"
+fi
+
 ################################################################################
 # Update status file and exit
 {% raw %}

zppy/templates/ilamb.bash

@@ -39,7 +39,9 @@ echo
 # Create output directory
 # Create local links to input cmip time-series files
 lnd_ts_for_ilamb={{ output }}/post/lnd/{{ ts_land_grid }}/cmip_ts/monthly/
+{% if not land_only %}
 atm_ts_for_ilamb={{ output }}/post/atm/{{ ts_atm_grid }}/cmip_ts/monthly/
+{% endif %}
 # Go through the time series files for between year1 and year2,
 # using a step size equal to the number of years per time series file
 start_year=$(echo $Y1 | sed 's/^0*//')
@@ -56,12 +58,14 @@ do
     echo 'ERROR (1)' > {{ prefix }}.status
     exit 1
   fi
+{% if not land_only %}
   cp -s ${atm_ts_for_ilamb}/*_*_*_*_*_*_${start_year}??-${end_year}??.nc .
   if [ $? != 0 ]; then
     cd {{ scriptDir }}
     echo 'ERROR (2)' > {{ prefix }}.status
     exit 2
   fi
+{% endif %}
 done
 cd ../..
 

zppy/utils.py

@@ -220,6 +220,7 @@ def set_component_and_prc_typ(c: Dict[str, Any]) -> None:
         prc_typ = tmp
     elif tmp in ("mosart",):
         component = "rof"
+        prc_typ = tmp
     else:
         raise ValueError(
             f"Cannot extract output component name from {c['input_component']} or {c['input_files']}."