Changeset 25502

Timestamp:

08/31/20 19:41:23 (5 years ago)

Author:

jdquinn

Message:

BUG: Corrected frictionshakti failure (constructor works more like MATLAB now; added structtobj.py); prefer function 'fieldnames' to 'fields' in MATLAB

Location:

issm/trunk-jpl

Files:

• src/m/classes/frictionshakti.m (modified) (2 diffs)
• src/m/classes/frictionshakti.py (modified) (3 diffs)
• src/m/classes/model.m (modified) (6 diffs)
• src/m/classes/sealevelmodel.m (modified) (1 diff)
• src/m/consistency/comparemodels.m (modified) (2 diffs)
• src/m/contrib/defleurian/netCDF/export_netCDF.m (modified) (6 diffs)
• src/m/contrib/larour/mdanalysis.m (modified) (3 diffs)
• src/m/miscellaneous/fielddisplay.m (modified) (1 diff)
• src/m/miscellaneous/structtoobj.m (modified) (1 diff)
• src/m/plot/plot_transient_movie.m (modified) (1 diff)
• src/m/plot/processdata.m (modified) (1 diff)
• src/m/regional/regionaltransient2d.m (modified) (2 diffs)
• src/m/solve/convert2str.m (modified) (1 diff)
• test/NightlyRun/test350.m (modified) (1 diff)
• test/NightlyRun/test350.py (modified) (1 diff)

issm/trunk-jpl/src/m/classes/frictionshakti.m

@@ -9 +9 @@
         end
         methods
-                function self = extrude(self,md) % {{{
-                        self.coefficient=project3d(md,'vector',self.coefficient,'type','node','layer',1);
-                end % }}}
                 function self = frictionshakti(varargin) % {{{
                         switch nargin
@@ -24 +21 @@
                 function self = setdefaultparameters(self) % {{{
 
+                end % }}}
+                function self = extrude(self,md) % {{{
+                        self.coefficient=project3d(md,'vector',self.coefficient,'type','node','layer',1);
                 end % }}}
                 function md = checkconsistency(self,md,solution,analyses) % {{{

issm/trunk-jpl/src/m/classes/frictionshakti.py

@@ -4 +4 @@
 from fielddisplay import fielddisplay
 from project3d import project3d
+from structtoobj import structtoobj
 from WriteData import WriteData
 
@@ -14 +15 @@
     """
 
-    def __init__(self, md):  # {{{
+    def __init__(self, *args):  # {{{
         self.coefficient = np.nan
-        #set defaults
-        self.setdefaultparameters()
+        
+        nargs = len(args)
+        if nargs == 0:
+            self.setdefaultparameters()
+        elif nargs == 1:
+            self = structtoobj(self, args[0])
     #}}}
 
@@ -42 +47 @@
 
         md = checkfield(md, 'fieldname', 'friction.coefficient', 'timeseries', 1, 'NaN', 1, 'Inf', 1)
+
         return md
     # }}}

issm/trunk-jpl/src/m/classes/model.m

@@ -424 +424 @@
                                 if isobject(md.outputdefinition.definitions{i})
                                         %get subfields
-                                        solutionsubfields=fields(md.outputdefinition.definitions{i});
+                                        solutionsubfields=fieldnames(md.outputdefinition.definitions{i});
                                         for j=1:length(solutionsubfields),
                                                 field=md.outputdefinition.definitions{i}.(solutionsubfields{j});
@@ -548 +548 @@
 
                         %loop over model fields
-                        model_fields=fields(md1);
+                        model_fields=fieldnames(md1);
                         for i=1:length(model_fields),
                                 %get field
@@ -554 +554 @@
                                 fieldsize=size(field);
                                 if isobject(field), %recursive call
-                                        object_fields=fields(md1.(model_fields{i}));
+                                        object_fields=fieldnames(md1.(model_fields{i}));
                                         for j=1:length(object_fields),
                                                 %get field
@@ -721 +721 @@
                         if isstruct(md1.results),
                                 md2.results=struct();
-                                solutionfields=fields(md1.results);
+                                solutionfields=fieldnames(md1.results);
                                 for i=1:length(solutionfields),
                                         if isstruct(md1.results.(solutionfields{i}))
@@ -728 +728 @@
                                                 for p=1:length(md1.results.(solutionfields{i}))
                                                     current = md1.results.(solutionfields{i})(p);
-                                                    solutionsubfields=fields(current);
+                                                    solutionsubfields=fieldnames(current);
                                                     for j=1:length(solutionsubfields),
                                                         field=md1.results.(solutionfields{i})(p).(solutionsubfields{j});
@@ -757 +757 @@
                                 if isobject(md1.outputdefinition.definitions{i})
                                         %get subfields
-                                        solutionsubfields=fields(md1.outputdefinition.definitions{i});
+                                        solutionsubfields=fieldnames(md1.outputdefinition.definitions{i});
                                         for j=1:length(solutionsubfields),
                                                 field=md1.outputdefinition.definitions{i}.(solutionsubfields{j});

issm/trunk-jpl/src/m/classes/sealevelmodel.m

@@ -106 +106 @@
                 end % }}}
                 function self=mergeresults(self) % {{{
-                        champs=fields(self.icecaps{1}.results.TransientSolution);
+                        champs=fieldnames(self.icecaps{1}.results.TransientSolution);
                         for i=1:length(self.mergedcaps)/2,
                                 md=self.mergedcaps{2*(i-1)+1}; trans=self.mergedcaps{2*(i-1)+2};

issm/trunk-jpl/src/m/consistency/comparemodels.m

@@ -2 +2 @@
 
         %loop over model fields
-        model_fields=fields(md1);
+        model_fields=fieldnames(md1);
         for i=1:length(model_fields),
                 field1=md1.(model_fields{i});
@@ -11 +11 @@
                                 continue;
                         end
-                        object_fields=fields(md1.(model_fields{i}));
+                        object_fields=fieldnames(md1.(model_fields{i}));
                         for j=1:length(object_fields),
                                 field1=md1.(model_fields{i}).(object_fields{j});

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

@@ -54 +54 @@
                 groupID=netcdf.defGrp(ncid,groups{i});
                 %In each group gather the fields of the class
-                groupfields=fields(md.(groups{i}));
+                groupfields=fieldnames(md.(groups{i}));
                 for j=1:length(groupfields),
                         Var=md.(groups{i}).(groupfields{j});
@@ -87 +87 @@
                                                 listgroupID=netcdf.defGrp(subgroupID,lname);
                                                 netcdf.putAtt(listgroupID,netcdf.getConstant('NC_GLOBAL'),'classtype',class(Var{l}));
-                                                subfields=fields(Var{l});
+                                                subfields=fieldnames(Var{l});
                                                 for m=1:length(subfields)
                                                         if ~strcmp(subfields{m},'outlog')
@@ -121 +121 @@
                                                 listgroupID=netcdf.defGrp(subgroupID,lname);
                                                 netcdf.putAtt(listgroupID,netcdf.getConstant('NC_GLOBAL'),'classtype',classtype);
-                                                subfields=fields(Var(l));
+                                                subfields=fieldnames(Var(l));
                                                 for m=1:length(subfields)
                                                         if ~strcmp(subfields{m},'outlog')
@@ -135 +135 @@
                                         end
                                         netcdf.putAtt(subgroupID,netcdf.getConstant('NC_GLOBAL'),'classtype',classtype);
-                                        subfields=fields(Var);
+                                        subfields=fieldnames(Var);
                                         for m=1:length(subfields)
                                                 if ~strcmp(subfields{m},'outlog')
@@ -197 +197 @@
         elseif isa(Var,'struct'),
                 %Start by getting the structure fields and size
-                locfields=fields(Var);
+                locfields=fieldnames(Var);
                 [dims,DimSize,DimValue]=GetDims(ncid,Var,DimSize,DimValue);
                 varid = netcdf.defVar(groupID,field,'NC_CHAR',dims);
@@ -244 +244 @@
                 varsize=size(Var');
         elseif isa(Var,'struct')
-                varsize=length(fields(Var));
+                varsize=length(fieldnames(Var));
         else
                 varsize=size(Var);

issm/trunk-jpl/src/m/contrib/larour/mdanalysis.m

@@ -531 +531 @@
         mv=md.mask; 
 end
-strings=fields(mv);
+strings=fieldnames(mv);
 strings={'all',strings{:}};
 set(hObject,'String',strings);
@@ -693 +693 @@
 if issealevel,
         if isearth,
-                resultfields=fields(md.earth.results);
+                resultfields=fieldnames(md.earth.results);
         else
-                resultfields=fields(md.icecaps{1}.results);
+                resultfields=fieldnames(md.icecaps{1}.results);
         end
 else
-        resultfields=fields(md.results);
+        resultfields=fieldnames(md.results);
 end
 if isempty(resultfields),
@@ -854 +854 @@
 end
 fieldHandle=findobj('Tag', 'Masque');
-strings=fields(mv);
+strings=fieldnames(mv);
 strings={'all',strings{:}};
 set(fieldHandle,'String',strings);

issm/trunk-jpl/src/m/miscellaneous/fielddisplay.m

@@ -75 +75 @@
 function struct_display(offset,name,field,comment) % {{{
 
-        if ~isempty(fields(field))
+        if ~isempty(fieldnames(field))
                 displayunit(offset,name,'(structure)',comment),
                 offset=[offset '   '];
 
-                structure_fields=fields(field);
+                structure_fields=fieldnames(field);
 
                 for i=1:length(structure_fields),

issm/trunk-jpl/src/m/miscellaneous/structtoobj.m

@@ -3 +3 @@
 
         %Get object and structure fields
-        structfields=fields(S);
+        structfields=fieldnames(S);
         objprops    =properties(class(obj));
 
         %recover object properties
         for i=1:length(structfields),
-                fieldname =structfields{i};
+                fieldname=structfields{i};
                 if ismember(fieldname,objprops),
                         fieldvalue=getfield(S,fieldname);

issm/trunk-jpl/src/m/plot/plot_transient_movie.m

@@ -14 +14 @@
         else
                 disp('List of available fields:');
-                F=fields(md.results.TransientSolution(1));
+                F=fieldnames(md.results.TransientSolution(1));
                 num = [];
                 for i=1:numel(F),

issm/trunk-jpl/src/m/plot/processdata.m

@@ -20 +20 @@
 if isstruct(data),
         disp('data provided is a struct with the following fields:');
-        F=fields(data);
+        F=fieldnames(data);
         for i=1:numel(F),
                 disp(['   ' num2str(i) ': ' F{i} ]);

issm/trunk-jpl/src/m/regional/regionaltransient2d.m

@@ -43 +43 @@
 
         %loop over model fields
-        model_fields=fields(md1);
+        model_fields=fieldnames(md1);
         for i=1:length(model_fields),
 
@@ -52 +52 @@
                 %copy field, interpolated to new mesh
                 if isobject(field), %recursive call
-                        object_fields=fields(md1.(model_fields{i}));
+                        object_fields=fieldnames(md1.(model_fields{i}));
                         fname=['(model_fields{i}).(object_fields{j})'];
                 else

issm/trunk-jpl/src/m/solve/convert2str.m

@@ -109 +109 @@
 function str = struct_display(field) % {{{
 
-        if ~isempty(fields(field))
+        if ~isempty(fieldnames(field))
                 displayunit('(structure)'),
 
-                structure_fields=fields(field);
+                structure_fields=fieldnames(field);
 
                 for i=1:length(structure_fields),

issm/trunk-jpl/test/NightlyRun/test350.m

@@ -10 +10 @@
 md.cluster=generic('name',oshostname(),'np',2);
 
-%Use hydroogy coupled friciton law
+%Use hydrology coupled friction law
 md.friction=frictionshakti(md.friction);
 

issm/trunk-jpl/test/NightlyRun/test350.py

@@ -22 +22 @@
 md.cluster = generic('name', gethostname(), 'np', 2)
 
-#Use hydroogy coupled friciton law
-md.friction = frictionshakti(md)
+#Use hydrology coupled friction law
+md.friction = frictionshakti(md.friction)
 
 #Change hydrology class to Shakti' model