Changeset 9565

Timestamp:

09/01/11 16:39:40 (14 years ago)

Author:

Mathieu Morlighem

Message:

Finished class debug

Location:

issm/trunk/src/m/classes

Files:

• clusters/castor.m (modified) (1 diff)
• clusters/cosmos.m (modified) (1 diff)
• clusters/gemini.m (modified) (1 diff)
• clusters/generic.m (modified) (3 diffs)
• clusters/pfe.m (modified) (2 diffs)
• clusters/pollux.m (modified) (1 diff)
• model/model.m (modified) (2 diffs)

issm/trunk/src/m/classes/clusters/castor.m

@@ -60 +60 @@
                          modelname=md.name; 
                          solution_type=md.solution_type; 
-                         mem_debug=md.mem_debug;
 
                          %open file for writing: 

issm/trunk/src/m/classes/clusters/cosmos.m

@@ -60 +60 @@
                          modelname=md.name; 
                          solution_type=md.solution_type; 
-                         mem_debug=md.mem_debug;
 
                          %open file for writing: 

issm/trunk/src/m/classes/clusters/gemini.m

@@ -60 +60 @@
                          modelname=md.name; 
                          solution_type=md.solution_type; 
-                         mem_debug=md.mem_debug;
 
                          %open file for writing: 

issm/trunk/src/m/classes/clusters/generic.m

@@ -74 +74 @@
                          modelname=md.name;
                          solution_type=md.solution_type;
-                         mem_debug=md.mem_debug;
+                         isvalgrind=md.debug.valgrind;
+                         isgprof=md.debug.gprof;
 
                          %open file for writing: 
@@ -81 +82 @@
                          %write instructions for launching a job on the cluster
                          fprintf(fid,'#!/bin/sh\n');
-                         if mem_debug==0,
+                         if ~isvalgrind,
                                  if cluster.interactive
                                          fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s ',...
@@ -95 +96 @@
                          end
 
-                         if md.gprof,
+                         if isgprof,
                                  fprintf(fid,'\n gprof %s/issm.exe gmon.out > %s.performance',cluster.codepath,modelname);
                          end

issm/trunk/src/m/classes/clusters/pfe.m

@@ -110 +110 @@
                          modelname=md.name; 
                          solution_type=md.solution_type; 
-                         mem_debug=md.mem_debug;
+                         isvalgrind=md.debug.valgrind;
 
                          %compute number of processors
@@ -151 +151 @@
                          if cluster.interactive,
                                  fid=fopen([modelname '.run'],'w');
-                                 if ~mem_debug,
+                                 if ~isvalgrind,
                                          fprintf(fid,'mpiexec -verbose -np %i %s/issm.exe %s $PBS_O_WORKDIR %s\n',cluster.np,cluster.codepath,EnumToString(solution_type),modelname);
                                  else

issm/trunk/src/m/classes/clusters/pollux.m

@@ -60 +60 @@
                          modelname=md.name; 
                          solution_type=md.solution_type; 
-                         mem_debug=md.mem_debug;
 
                          %open file for writing: 

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

@@ -12 +12 @@
                  results = modelfield('default',0,'marshall',false);
                  solver  = modelfield('default',0,'marshall',false);
+                 debug   = modelfield('default',0,'marshall',false);
 
                  %FIXME: all other fields should belong to other classes
@@ -198 +199 @@
                  %Output
                  requested_outputs               = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3);
-                 %Debugging
-                 mem_debug                      = modelfield('default',0,'marshall',false);
-                 gprof                          = modelfield('default',0,'marshall',false);
                  %Results fields
                  output_frequency               = modelfield('default',0,'marshall',true,'format','Integer');