Merge pull request #158 from ACCESS-NRI/157/ESM1.5-stash-overwrite

Add stashvar model overwrite functionality, and missing ESM1.5 variable names

src/um2nc/conversion_driver_esm1p5.py

@@ -22,6 +22,7 @@
 from pathlib import Path
 from um2nc import um2netcdf
 import mule
+from um2nc.stashmasters import STASHmaster
 
 
 # TODO: um2netcdf will update the way arguments are fed to `process`.
@@ -31,10 +32,11 @@
 # Named tuple to hold the argument list
 ARG_NAMES = collections.namedtuple(
     "Args",
-    "nckind compression simple nomask hcrit verbose include_list exclude_list nohist use64bit",
+    "nckind compression simple nomask hcrit verbose include_list exclude_list nohist use64bit model",
 )
 # TODO: Confirm with Martin the below arguments are appropriate defaults.
-ARG_VALS = ARG_NAMES(3, 4, True, False, 0.5, False, None, None, False, False)
+ARG_VALS = ARG_NAMES(3, 4, True, False, 0.5, False, None, None, False, False,
+                     STASHmaster.ACCESS_ESM1p5)
 
 
 # Character in filenames specifying the unit key