Changeset 2115

Timestamp:

09/06/09 16:18:41 (15 years ago)

Author:

Eric.Larour

Message:

Fixed bug in dakota: no restart file present

Location:

issm/trunk/src

Files:

• c/Qmux/SpawnCoreParallel.cpp (modified) (1 diff)
• m/classes/public/loadresultsfromcluster.m (modified) (1 diff)
• m/classes/public/loadresultsfromdisk.m (modified) (1 diff)
• m/solutions/dakota/dakota_in_data.m (modified) (1 diff)

issm/trunk/src/c/Qmux/SpawnCoreParallel.cpp

@@ -175 +175 @@
         /*Now process the outputs, before computing the dakota responses: */
         if(debug)_printf_("process results:\n");
+
         ProcessResults(&processed_results,results,model,analysis_type); 
-        
+
         /*compute responses on cpu 0: dummy for now! */
         if(debug)_printf_("compute dakota responses:\n");

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

@@ -12 +12 @@
 
 %What packages are we picking up from remote cluster
-packages={[md.name '.outlog'],[md.name '.errlog'], [md.name '.outbin']};
+packages={[md.name '.outlog'],[md.name '.errlog']};
 if md.qmu_analysis,
         packages{end+1}=[md.name '.qmu.err'];
         packages{end+1}=[md.name '.qmu.out'];
-        packages{end+1}='dakota_tabular.dat';
+        %packages{end+1}='dakota_tabular.dat'; not for now.
+else
+        packages{end+1}=[md.name '.outbin'];
 end
 

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

@@ -11 +11 @@
 end
 
-%load result onto model
-if ~isstruct(md.results),
-        md.results=struct();
-end
+if ~md.qmu_analysis,
+        %load result onto model
+        if ~isstruct(md.results),
+                md.results=struct();
+        end
 
-structure=parseresultsfromdisk(filename);
-md.results.(structure.analysis_type)=structure;
+        structure=parseresultsfromdisk(filename);
+        md.results.(structure.analysis_type)=structure;
 
-%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 !!') 
+        %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
 end
 

issm/trunk/src/m/solutions/dakota/dakota_in_data.m

@@ -136 +136 @@
 
 %Write m file
-dakota_m_write(dmeth.method,dmeth,dvar,dresp,params,filei,package,varargin{:});
+%dakota_m_write(dmeth.method,dmeth,dvar,dresp,params,filei,package,varargin{:});
 
 end