Changeset 26968

Timestamp:

04/24/22 08:36:51 (3 years ago)

Author:

bdef

Message:

BUG:some netcdf fixes

Location:

issm/trunk-jpl/src/m

Files:

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

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

@@ -1 +1 @@
 function export_netCDF(md,filename)
 %verbosity of the code, 0 is no messages, 5 is chatty
-        verbose = 0;
+        verbose = 5;
         if exist(filename),
                 delete(filename)
@@ -182 +182 @@
                                         end
                                         for k=1:length(subfields),
-                                                if ~ismember(subfields{k}, {'errlog', 'outlog'})
+                                                if ~ismember(subfields{k}, {'errlog', 'outlog', 'SolutionType'})
                                                         StackedVar=restable();
                                                         for l=1:Listsize,
@@ -201 +201 @@
                                                         if ~isempty(varid),
                                                                 FillVar(StackedVar,subgroupID,varid);
+                                                        end
+                                                elseif ismember(subfields{k}, {'SolutionType'})
+                                                        %We just add solution type once as an attribute
+                                                        Var = md.(groups{i}).(fields{j})(1).(subfields{k});
+                                                        [DimSize,DimValue,varid]=CreateVar(ncid,Var,subgroupID,subfields{k},DimSize,DimValue);
+                                                        if ~isempty(varid),
+                                                                FillVar(Var,subgroupID,varid);
                                                         end
 

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

@@ -36 +36 @@
                     maxsize.append(np.nanmax(datasize[:, dim]))
             except IndexError:
-                maxsize.append(np.nanmax(datasize[:]))
+                if datasize.ndim == 0:
+                    maxsize.append(datasize)
+                else:
+                    maxsize.append(np.nanmax(datasize[:]))
             findim = np.insert(maxsize, 0, rows)
             #first check if all steps are the same size
-            SameSize = np.sum(np.abs(datasize - datasize[0])) == 0
+            if datasize.ndim == 0:
+                SameSize = True
+            else:
+                SameSize = np.sum(np.abs(datasize - datasize[0])) == 0
             if SameSize:
                 #same size for all steps, just reshape

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

@@ -199 +199 @@
                                 if timeindex:
                                     if NewFormat:
-                                        if vardim == 1:
+                                        if vardim == 0:
+                                            try:
+                                                Tree[0].__dict__[str(var)] = varval[timeindex].data
+                                            except IndexError:
+                                                print('WARNING: No data on index {} for {} reverting to last time.'.format(timeindex, str(var)))
+                                                Tree[0].__dict__[str(var)] = varval[-1].data
+                                        elif vardim == 1:
                                             try:
                                                 Tree[0].__dict__[str(var)] = varval[timeindex].data