Merge pull request #220 from ACCESS-Community-Hub/issue219

Issue219

Author: paolap

src/mopper/mop_setup.py

@@ -19,7 +19,7 @@
 # originally written for CMIP5 by Peter Uhe and dapted for CMIP6 by Chloe Mackallah
 # ( https://doi.org/10.5281/zenodo.7703469 )
 #
-# last updated 10/10/2024
+# last updated 01/08/2025
 
 import os
 import shutil
@@ -96,7 +96,10 @@ def find_matches(table, var, realm, frequency, mappings):
         resample = match.get('resample', '')
         timeshot, frequency, orig_timeshot = define_timeshot(frequency, resample,
             match['cell_methods'])
-        match['resample'] = f"{resample} {orig_timeshot}"
+        if resample != "":
+            resample = f"{resample} {orig_timeshot}"
+        match['resample'] = resample
+        mop_log.debug(f"Resample is {resample}")
         match['timeshot'] = timeshot
         match['table'] = table
         match['frequency'] = frequency

src/mopper/setup_utils.py

@@ -766,7 +766,7 @@ def define_template(ctx, flag, nrows):
 # for a list of packages
 
 module use /g/data/hh5/public/modules
-module load conda/analysis3
+module load conda/analysis3-unstable
 {ctx.obj['conda_env']}
 
 cd {ctx.obj['appdir']}