Fixed iplot_members and moved rmse_xyt out of cdftools in standard_op…

…erators
jservonnat · Aug 24, 2023 · 67ffc36 · 67ffc36
1 parent ce8fecb
commit 67ffc36
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/climaf/functions.py b/climaf/functions.py
@@ -872,7 +872,7 @@ def iplot_members(ens, nplot=12, N=1, **pp):
     if start > len(members):
         return 'The list of members is shorter than what you asked; specify smaller N or nplot'
     if end > len(members):
-        end = -1
+        end = len(members)
     members_selection = members[start:end]
     for mem in ens:
         if mem not in members_selection:

diff --git a/climaf/standard_operators.py b/climaf/standard_operators.py
@@ -328,6 +328,11 @@ def load_standard_operators():
             _var='curltau')
 
     #
+    # rmse_xyt
+    cscript(
+        'rmse_xyt', 'cdo sqrt -fldmean -timmean -sqr -sub ${in_1} ${in_2} ${out}')
+    #
+
     if os.system("type cdfmean >/dev/null 2>&1") == 0:
         load_cdftools_operators()
     else:
@@ -465,6 +470,3 @@ def load_cdftools_operators():
             'zo${Var}_${basin} tmpfile.nc ${out}; rm -f tmpfile.nc zonalmean.nc',
             _var="zo%s_${basin}", canSelectVar=True)
     #
-    # rmse_xyt
-    cscript(
-        'rmse_xyt', 'cdo sqrt -fldmean -timmean -sqr -sub ${in_1} ${in_2} ${out}')