Changeset 11664

Timestamp:

03/07/12 14:00:50 (14 years ago)

Author:

Mathieu Morlighem

Message:

better recovery process

File:

• issm/trunk-jpl/src/m/classes/model/model.m (modified) (2 diffs)

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

@@ -158 +158 @@
                          if isfield(structmd,'drag_p'), md.friction.p=structmd.drag_p; end
                          if isfield(structmd,'drag_q'), md.friction.q=structmd.drag_q; end
-                         if isfield(structmd,'riftproperties'),
-                                 md.rifts=rifts;
+                         if isfield(structmd,'riftproperties'), %old implementation
+                                 md.rifts=rifts();
                                  md.rifts.riftproperties=structmd.riftproperties; 
+                                 md.rifts.riftstruct=structmd.rifts;
+                                 md.rifts.riftproperties=structmd.riftinfo;
                          end
                          if isfield(structmd,'bamg'), md.private.bamg=structmd.bamg; end
@@ -273 +275 @@
                          if isfield(structmd,'pressureload'), md.diagnostic.icefront=structmd.pressureload; end
                          if isfield(structmd,'diagnostic_ref'), md.diagnostic.referential=structmd.diagnostic_ref; end
-                         if isfield(structmd,'rifts'), md.rifts.riftstruct=structmd.rifts; end
-                         if isfield(structmd,'riftsinfo'), md.rifts.riftproperties=structmd.riftinfo; end
+
 
                          %Field changes