Merge pull request #161 from FESOM/workbench

Workbench
FESOM · Oct 18, 2024 · c988bbe · c988bbe
2 parents 28fa82e + 9288721
commit c988bbe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/tripyview/sub_data.py b/tripyview/sub_data.py
@@ -544,10 +544,13 @@ def do_fnamemask(do_file,vname,runid,year):
     
     ____________________________________________________________________________
     """
-    if   do_file=='run'        : fname = '{}.{}.{}.nc'.format(   vname,runid,year)
-    elif do_file=='restart_oce': fname = '{}.{}.oce.restart.nc'.format(runid,year)
-    elif do_file=='restart_ice': fname = '{}.{}.ice.restart.nc'.format(runid,year)
-    elif do_file=='blowup'     : fname = '{}.{}.oce.blowup.nc'.format( runid,year)
+    if   do_file=='run'            : fname = '{}.{}.{}.nc'.format(   vname,runid,year)
+    elif do_file=='restart_oce'    : fname = '{}.{}.oce.restart/{}.nc'.format(runid,year,vname)
+    elif do_file=='restart_ice'    : fname = '{}.{}.ice.restart/{}.nc'.format(runid,year,vname)
+    elif do_file=='restart_icepack': fname = '{}.{}.icepack.restart/{}.nc'.format(runid,year,vname)
+    elif do_file=='blowup'         : fname = '{}.{}.oce.blowup.nc'.format( runid,year)
+    #elif do_file=='restart_oce': fname = '{}.{}.oce.restart.nc'.format(runid,year)
+    #elif do_file=='restart_ice': fname = '{}.{}.ice.restart.nc'.format(runid,year)
 
     #___________________________________________________________________________
     return(fname)

diff --git a/tripyview/sub_plot.py b/tripyview/sub_plot.py
@@ -5853,7 +5853,7 @@ def do_setupcinfo(cinfo, data, do_rescale, mesh=None, tri=None, do_vec=False,
                         new_cref  = np.around(cref, ini_dez-dez)
                         #print(prev_cref, new_cref, dez, ini_dez-dez)
                         #if (new_cref<cref-dc/10 or new_cref>cref+dc/10 or prev_cref==new_cref) and dez!=0:
-                        if (new_cref<cref-dc/10 or new_cref>cref+dc/10 or dez>10) and dez!=0:    
+                        if (new_cref<cref-dc/10 or new_cref>cref+dc/10 or dez>25) and dez!=0:    
                             break
                         else: 
                             dez=dez+1