source: issm/oecreview/Archive/25834-26739/ISSM-26082-26083.diff@ 26740

Index: ../trunk-jpl/src/m/classes/frictioncoulomb2.m
===================================================================
--- ../trunk-jpl/src/m/classes/frictioncoulomb2.m       (revision 26082)
+++ ../trunk-jpl/src/m/classes/frictioncoulomb2.m       (revision 26083)
@@ -11,6 +11,17 @@
                effective_pressure       = NaN;
                effective_pressure_limit = 0;
        end
+       methods (Static)
+               function self = loadobj(self) % {{{
+                       if isstruct(self)
+                               disp('Recovering frictioncoulomb2 from older version');
+                               if isfield(self,'coefficient')
+                                       self.C = self.coefficient;
+                               end
+                               self = structtoobj(frictioncoulomb2(),self);
+                       end
+               end% }}}
+       end
        methods
                function self = extrude(self,md) % {{{
                        self.C=project3d(md,'vector',self.C,'type','node','layer',1);
Index: ../trunk-jpl/src/m/classes/model.m
===================================================================
--- ../trunk-jpl/src/m/classes/model.m  (revision 26082)
+++ ../trunk-jpl/src/m/classes/model.m  (revision 26083)
@@ -132,8 +132,6 @@
                                        md.settings.solver_residue_threshold = 1e-6;
                                end
                        end
-                       %2017 April 10th
-                       if isa(md.gia,'gia'), md.gia=giamme(); end
                        %2017 May 4th
                        if isa(md.amr,'double'); md.amr=amr(); end
                        %2017 Aug 29th
@@ -176,7 +174,7 @@
                                end
                        end
                        %2019 Dec 16
-                       if isa(md.dsl,'double') | isempty(md.dsl.compute_fingerprints)
+                       if isa(md.dsl,'double') 
                                md.dsl=dsl();
                        end
                        %2020 April 24