diff --git a/zppy/ilamb_run.py b/zppy/ilamb_run.py index 242d5ac2..85400892 100644 --- a/zppy/ilamb_run.py +++ b/zppy/ilamb_run.py @@ -28,7 +28,7 @@ def ilamb_run(config, scriptDir, existing_bundles): # --- List of ilamb_run tasks --- tasks = getTasks(config, "ilamb_run") if len(tasks) == 0: - return [] + return existing_bundles # --- Generate and submit ilamb_run scripts --- dependencies = [] diff --git a/zppy/templates/bundle.bash b/zppy/templates/bundle.bash index bcac6223..94f35f74 100644 --- a/zppy/templates/bundle.bash +++ b/zppy/templates/bundle.bash @@ -23,7 +23,7 @@ error=false echo === {{ task }} === task={{ task }} taskStatusFile="${task%.*}.status" -if [ ! -f ${taskStatusFile} ] || [ `cat ${taskStatusFile}` != "OK" ] ; then +if [ ! -f ${taskStatusFile} ] || [ "`cat ${taskStatusFile}`" != "OK" ] ; then ./{{ task }} if [ $? -ne 0 ]; then error=true diff --git a/zppy/templates/ocean_month.py b/zppy/templates/ocean_month.py index 12cfd4fd..080ec81d 100644 --- a/zppy/templates/ocean_month.py +++ b/zppy/templates/ocean_month.py @@ -29,10 +29,10 @@ tunits = "days since 0001-01-01 00:00:00" # Loop over year sets -for y in range(start_yr, end_yr, 10): +for y in range(start_yr, end_yr, ts_num_years): year1 = y - year2 = y + 10 - 1 + year2 = y + ts_num_years - 1 files = [] for year in range(year1, year2 + 1): print("year=", year)