Changeset 25063

Timestamp:

06/18/20 05:42:29 (5 years ago)

Author:

bdef

Message:

CHG:last tweaks on netCDF IO

Location:

issm/trunk-jpl/src/m

Files:

• contrib/defleurian/netCDF/export_netCDF.py (modified) (4 diffs)
• io/loadvars.py (modified) (1 diff)

issm/trunk-jpl/src/m/contrib/defleurian/netCDF/export_netCDF.py

@@ -7 +7 @@
 
 def export_netCDF(md, filename):  # {{{
-    res_time = time.time()
     debug = False
     if path.exists(filename):
@@ -87 +86 @@
                         subfields = dict.keys(md.__dict__[group].__dict__[field].__getitem__(0))
 
-                    # for subfield in subfields:
-                    #     if subfield not in['errlog', 'outlog']:
-                    #         #first create the variable
-                    #         try:
-                    #             Var = md.__dict__[group].__dict__[field].__getitem__(0).__dict__[subfield]
-                    #         except AttributeError:
-                    #             Var = md.__dict__[group].__dict__[field].__getitem__(0)[subfield]
-                    #         Var = SqueezeVar(Var)
-                    #         #If first time we create a nc variable
-                    #         if Listsize == len(TimeDim):
-                    #             ExtraDim = 'Time'
-                    #         else:
-                    #             ExtraDim = 'Unlim'
-                    #         if debug:
-                    #             print("=$$=creating var for {}.{}.{}".format(group, field, subfield))
-                    #         DimDict, ncvar = CreateVar(NCData, Var, subfield, Subgroup, DimDict, ExtraDim)
-
-                    #         for listindex in range(0, Listsize):
-                    #             try:
-                    #                 Var = md.__dict__[group].__dict__[field].__getitem__(listindex).__dict__[subfield]
-                    #             except AttributeError:
-                    #                 Var = md.__dict__[group].__dict__[field].__getitem__(listindex)[subfield]
-                    #             Var = SqueezeVar(Var)
-                    #             #and fill it up
-                    #             FillVar(ncvar, Var, listindex)
-
                     for subfield in subfields:
                         if subfield not in['errlog', 'outlog']:
@@ -126 +99 @@
                                 except AttributeError:
                                     Var = md.__dict__[group].__dict__[field].__getitem__(listindex)[subfield]
+                                except KeyError:
+                                    #Some fields only exist for the first step
+                                    continue
                                 Var = SqueezeVar(Var)
                                 StackedVar = np.vstack((StackedVar, Var))
@@ -174 +150 @@
                             FillVar(ncvar, Var)
     NCData.close()
-    print("export time is {}".format(time.time() - res_time))
 
 # }}}

issm/trunk-jpl/src/m/io/loadvars.py

@@ -124 +124 @@
                         dimlist = [curclass.variables[key].dimensions for key in keylist]
                         indexlist = np.arange(0, len(NCFile.dimensions['Time']))
-                        if 'Time' in np.all(dimlist):
+                        AllHaveTime = np.all(['Time' in dimtuple for dimtuple in dimlist])
+                        if AllHaveTime:
                             #Time dimension is in all the variables so we take that as stepnumber for the results
                             listtype = curclass.classtype