Changeset 2382

Timestamp:

10/07/09 14:56:14 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added outputfilename in model needed to save control intermediary results

Location:

issm/trunk/src/m/classes

Files:

• @model/model.m (modified) (1 diff)
• public/loadresultsfromdisk.m (modified) (1 diff)
• public/marshall.m (modified) (3 diffs)
• public/parametercontrol.m (modified) (1 diff)
• public/presolve.m (modified) (2 diffs)

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

@@ -221 +221 @@
 
         %Results fields
+        md.inputfilename='';
+        md.outputfilename='';
         md.results=NaN;
         md.vx=NaN;

issm/trunk/src/m/classes/public/loadresultsfromdisk.m

@@ -22 +22 @@
         %Check result is consistent, only if it exists
         disp(sprintf('%s\n','checking result consistency'));
-        if ~isresultconsistent(md,md.analysis_type),
-                %it would be very cruel to put an error, it would kill the computed results (even if not consistent...)
-                disp('!! results not consistent correct the model !!') 
-        end
+%       if ~isresultconsistent(md,md.analysis_type),
+%               %it would be very cruel to put an error, it would kill the computed results (even if not consistent...)
+%               disp('!! results not consistent correct the model !!') 
+%       end
 end
 

issm/trunk/src/m/classes/public/marshall.m

@@ -10 +10 @@
 %some checks on list of arguments
 if ((nargin~=3) & (nargout~=0))
-        marshallusage;
+        help marshall;
         error('marshall error message');
 end
@@ -173 +173 @@
 end
 
+%input and output file names
+WriteData(fid,md.inputfilename,'String','inputfilename');
+WriteData(fid,md.outputfilename,'String','outputfilename');
+
 %close file
 st=fclose(fid);
@@ -178 +182 @@
         error(['marshall error message: could not close file ' [md.name '.bin']]);
 end
-
-end
-
-
-function marshallusage();
-disp(' ');
-disp('function marshall(md,solutiontype)');
-disp(' marshall: output Cielo compatible binary file from @model md, for certain solution type.');
-disp('             solutiontype can be ''diagnostic'',''prognostic'' or ''control''. ');
-disp('             This binary file will be used for parallel runs in cielo.');
-disp('INPUT function marshall(md,solutiontype)');
-end

issm/trunk/src/m/classes/public/parametercontrol.m

@@ -15 +15 @@
 if exist(options,'nsteps'),
         nsteps=getoption(options,'nsteps');
-        if (length(nsteps)~=1 | nsteps>0 | floor(nsteps)==nsteps)
+        if (length(nsteps)~=1 | nsteps<=0 | floor(nsteps)~=nsteps)
                 md.nsteps=100;
         else

issm/trunk/src/m/classes/public/presolve.m

@@ -5 +5 @@
 %      md=presolve(md)
 
-%first, deal with rifts.
+%deal with outputfilename and inputfilename
+md.inputfilename=[md.name '.bin'];
+md.outputfilename=[md.name '.outbin'];
+
+%deal with rifts.
 if isempty(md.rifts) | isnans(md.rifts),
         md.numrifts=0;
@@ -29 +33 @@
         count=count+numpairsforthisrift;
 end
-
-