Changeset 26083

Timestamp:

03/12/21 13:38:17 (4 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing load with changing class names and fields

Location:

issm/trunk-jpl/src/m/classes

Files:

• frictioncoulomb2.m (modified) (1 diff)
• model.m (modified) (2 diffs)

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

@@ -11 +11 @@
                 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

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

@@ -133 +133 @@
                                 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
@@ -177 +175 @@
                         end
                         %2019 Dec 16
-                        if isa(md.dsl,'double') | isempty(md.dsl.compute_fingerprints)
+                        if isa(md.dsl,'double') 
                                 md.dsl=dsl();
                         end