Changeset 10184

Timestamp:

10/12/11 16:01:17 (13 years ago)

Author:

Mathieu Morlighem

Message:

warning off in loadmodel for petscoptions

Location:

issm/trunk/src/m

Files:

• classes/model/model.m (modified) (2 diffs)
• utils/Model/loadmodel.m (modified) (2 diffs)

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

@@ -274 +274 @@
                          if isfield(structmd,'diagnostic_ref'), md.diagnostic.referential=structmd.diagnostic_ref; end
 
-                         disp('-------------- file: model.m line: 276'); 
                          %Field changes
                          if (isfield(structmd,'type') & ischar(structmd.type)), 
@@ -283 +282 @@
                                  md.verbose=verbose;
                          end
-                         disp('-------------- file: model.m line: 285'); 
                          if isfield(structmd,'spcvelocity'), 
                                  md.diagnostic.spcvx=NaN*ones(md.mesh.numberofvertices,1);

issm/trunk/src/m/utils/Model/loadmodel.m

@@ -20 +20 @@
         %recover model on file and name it md
         warning off MATLAB:unknownElementsNowStruc;
+        warning off MATLAB:load:classNotFound
         struc=load(path,'-mat');
         warning on MATLAB:unknownElementsNowStruc;
+        warning on MATLAB:load:classNotFound
 
         name=char(fieldnames(struc));
@@ -28 +30 @@
         end
         md=struc.(name);
-        
-        %now, transform md into a new model
-        if ~strcmpi(class(md),'model') & ~strcmpi(class(md),'planet'),
-                md=structtomodel(model,md);
-        end
         if nargout,
                 varargout{1}=md;