Changeset 9853

Timestamp:

09/20/11 11:05:10 (13 years ago)

Author:

Mathieu Morlighem

Message:

Checkmodelconsistency passes solution and analyses to the objects for further checks

Location:

issm/trunk/src/m

Files:

• classes/autodiff.m (modified) (1 diff)
• classes/balancethickness.m (modified) (1 diff)
• classes/basalforcings.m (modified) (1 diff)
• classes/clusters/castor.m (modified) (3 diffs)
• classes/clusters/cosmos.m (modified) (3 diffs)
• classes/clusters/gemini.m (modified) (3 diffs)
• classes/clusters/generic.m (modified) (3 diffs)
• classes/clusters/none.m (modified) (1 diff)
• classes/clusters/pfe.m (modified) (4 diffs)
• classes/clusters/pollux.m (modified) (3 diffs)
• classes/constants.m (modified) (1 diff)
• classes/diagnostic.m (modified) (1 diff)
• classes/flaim.m (modified) (1 diff)
• classes/flowequation.m (modified) (1 diff)
• classes/friction.m (modified) (1 diff)
• classes/geometry.m (modified) (1 diff)
• classes/groundingline.m (modified) (1 diff)
• classes/hydrology.m (modified) (1 diff)
• classes/initialization.m (modified) (1 diff)
• classes/inversion.m (modified) (2 diffs)
• classes/mask.m (modified) (1 diff)
• classes/materials.m (modified) (1 diff)
• classes/mesh.m (modified) (2 diffs)
• classes/miscellaneous.m (modified) (1 diff)
• classes/private.m (modified) (1 diff)
• classes/prognostic.m (modified) (1 diff)
• classes/qmu.m (modified) (1 diff)
• classes/rifts.m (modified) (1 diff)
• classes/settings.m (modified) (1 diff)
• classes/solver.m (modified) (1 diff)
• classes/steadystate.m (modified) (1 diff)
• classes/surfaceforcings.m (modified) (1 diff)
• classes/thermal.m (modified) (1 diff)
• classes/timestepping.m (modified) (1 diff)
• classes/transient.m (modified) (1 diff)
• classes/verbose.m (modified) (1 diff)
• model/ismodelselfconsistent.m (modified) (1 diff)

issm/trunk/src/m/classes/autodiff.m ¶

@@ -35 +35 @@
                         end
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
 
                 end % }}}

issm/trunk/src/m/classes/balancethickness.m ¶

@@ -39 +39 @@
 
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
                         if ~ismember(md.balancethickness.stabilization,[0 1 3]),
                                 checkmessage('model not consistent: balancethickness.stabilization should be a scalar (0 or 1 or 3)');

issm/trunk/src/m/classes/basalforcings.m ¶

@@ -35 +35 @@
                         end
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
 
                         fields={'melting_rate','geothermalflux'};

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

@@ -46 +46 @@
                  end
                  %}}}
-                 function checkconsistency(cluster,md) % {{{1
+                 function checkconsistency(cluster,md,solution,analyses) % {{{1
 
                          available_queues={'shortc','longc'};
@@ -59 +59 @@
                          %retrieve parameters 
                          modelname=md.miscellaneous.name; 
-                         solution_type=md.private.solution; 
+                         solution=md.private.solution;
 
                          %open file for writing: 
@@ -77 +77 @@
                          fprintf(fid,'cd $PBS_O_WORKDIR\n');
                          fprintf(fid,'export OMP_NUM_THREADS=1\n');
-                         fprintf(fid,'dplace -s1 -c0-%i mpiexec -np %i %s/issm.exe %s %s %s',cluster.np-1,cluster.np,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname);
+                         fprintf(fid,'dplace -s1 -c0-%i mpiexec -np %i %s/issm.exe %s %s %s',cluster.np-1,cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname);
 
                          %close file

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

@@ -46 +46 @@
                  end
                  %}}}
-                 function checkconsistency(cluster,md) % {{{1
+                 function checkconsistency(cluster,md,solution,analyses) % {{{1
 
                          available_queues={'debug','shortq','longq'};
@@ -59 +59 @@
                          %retrieve parameters 
                          modelname=md.miscellaneous.name; 
-                         solution_type=md.private.solution; 
+                         solution=md.private.solution;
 
                          %open file for writing: 
@@ -76 +76 @@
                          fprintf(fid,'ulimit -s unlimited\n');
                          fprintf(fid,'ulimit -c 0\n');
-                         fprintf(fid,'/opt/mpich/gm/intel10.1/bin/mpiexec -np %i %s/issm.exe %s %s %s',cluster.np,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname);
+                         fprintf(fid,'/opt/mpich/gm/intel10.1/bin/mpiexec -np %i %s/issm.exe %s %s %s',cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname);
 
                          %close file

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

@@ -46 +46 @@
                  end
                  %}}}
-                 function checkconsistency(cluster,md) % {{{1
+                 function checkconsistency(cluster,md,solution,analyses) % {{{1
 
                          available_queues={'debug','shortg','longg'};
@@ -59 +59 @@
                          %retrieve parameters 
                          modelname=md.miscellaneous.name; 
-                         solution_type=md.private.solution; 
+                         solution=md.private.solution;
 
                          %open file for writing: 
@@ -77 +77 @@
                          fprintf(fid,'cd $PBS_O_WORKDIR\n');
                          fprintf(fid,'export OMP_NUM_THREADS=1\n');
-                         fprintf(fid,'dplace -s1 -c0-%i mpiexec -np %i %s/issm.exe %s %s %s',cluster.np-1,cluster.np,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname);
+                         fprintf(fid,'dplace -s1 -c0-%i mpiexec -np %i %s/issm.exe %s %s %s',cluster.np-1,cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname);
 
                          %close file

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

@@ -60 +60 @@
                  end
                  %}}}
-                 function checkconsistency(cluster,md) % {{{1
+                 function checkconsistency(cluster,md,solution,analyses) % {{{1
                          if cluster.np<1
                                  checkmessage(['number of processors should be at least 1']);
@@ -73 +73 @@
                          %retrieve parameters
                          modelname=md.miscellaneous.name;
-                         solution_type=md.private.solution;
+                         solution=md.private.solution;
                          isvalgrind=md.debug.valgrind;
                          isgprof=md.debug.gprof;
@@ -85 +85 @@
                                  if cluster.interactive
                                          fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s ',...
-                                                 cluster.np,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname);
+                                                 cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname);
                                  else
                                          fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',...
-                                                 cluster.np,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname);
+                                                 cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname,modelname,modelname);
                                  end
                          else
-                                 %fprintf(fid,'LD_PRELOAD=%s mpiexec -np %i %s --leak-check=full --gen-suppressions=all --suppressions=%s %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',cluster.valgrindlib,cluster.np,cluster.valgrind,cluster.valgrindsup,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname);
+                                 %fprintf(fid,'LD_PRELOAD=%s mpiexec -np %i %s --leak-check=full --gen-suppressions=all --suppressions=%s %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',cluster.valgrindlib,cluster.np,cluster.valgrind,cluster.valgrindsup,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname,modelname,modelname);
                                  fprintf(fid,'LD_PRELOAD=%s mpiexec -np %i %s --leak-check=full --suppressions=%s %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',...
-                                         cluster.valgrindlib,cluster.np,cluster.valgrind,cluster.valgrindsup, cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname);
+                                         cluster.valgrindlib,cluster.np,cluster.valgrind,cluster.valgrindsup, cluster.codepath,EnumToString(solution),cluster.executionpath,modelname,modelname,modelname);
                          end
 

issm/trunk/src/m/classes/clusters/none.m ¶

@@ -30 +30 @@
                  end
                  %}}}
-                 function checkconsistency(cluster,md) % {{{1
+                 function checkconsistency(cluster,md,solution,analyses) % {{{1
                  end
                  %}}}

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

@@ -65 +65 @@
                  end
                  %}}}
-                 function checkconsistency(cluster,md) % {{{1
+                 function checkconsistency(cluster,md,solution,analyses) % {{{1
 
                          available_queues={'long','debug'};
@@ -109 +109 @@
                          %retrieve parameters 
                          modelname=md.miscellaneous.name; 
-                         solution_type=md.private.solution; 
+                         solution=md.private.solution;
                          isvalgrind=md.debug.valgrind;
 
@@ -138 +138 @@
                          fprintf(fid,'cd $PBS_O_WORKDIR\n\n');
 
-                         fprintf(fid,'mpiexec -verbose -np %i %s/issm.exe %s $PBS_O_WORKDIR %s\n',cluster.np,cluster.codepath,EnumToString(solution_type),modelname);
+                         fprintf(fid,'mpiexec -verbose -np %i %s/issm.exe %s $PBS_O_WORKDIR %s\n',cluster.np,cluster.codepath,EnumToString(solution),modelname);
 
                          if ~md.settings.io_gather,
@@ -152 +152 @@
                                  fid=fopen([modelname '.run'],'w');
                                  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
-                                         fprintf(fid,'mpiexec -verbose -np %i valgrind --leak-check=full %s/issm.exe %s $PBS_O_WORKDIR %s\n',cluster.np,cluster.codepath,EnumToString(solution_type),modelname);
+                                         fprintf(fid,'mpiexec -verbose -np %i %s/issm.exe %s $PBS_O_WORKDIR %s\n',cluster.np,cluster.codepath,EnumToString(solution),modelname);
+                                 else
+                                         fprintf(fid,'mpiexec -verbose -np %i valgrind --leak-check=full %s/issm.exe %s $PBS_O_WORKDIR %s\n',cluster.np,cluster.codepath,EnumToString(solution),modelname);
                                  end
 

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

@@ -46 +46 @@
                  end
                  %}}}
-                 function checkconsistency(cluster,md) % {{{1
+                 function checkconsistency(cluster,md,solution,analyses) % {{{1
 
                          available_queues={'shortp','longp'};
@@ -59 +59 @@
                          %retrieve parameters 
                          modelname=md.miscellaneous.name; 
-                         solution_type=md.private.solution; 
+                         solution=md.private.solution;
 
                          %open file for writing: 
@@ -77 +77 @@
                          fprintf(fid,'cd $PBS_O_WORKDIR\n');
                          fprintf(fid,'export OMP_NUM_THREADS=1\n');
-                         fprintf(fid,'dplace -s1 -c0-%i mpiexec -np %i %s/issm.exe %s %s %s',cluster.np-1,cluster.np,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname);
+                         fprintf(fid,'dplace -s1 -c0-%i mpiexec -np %i %s/issm.exe %s %s %s',cluster.np-1,cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname);
 
                          %close file

issm/trunk/src/m/classes/constants.m ¶

@@ -45 +45 @@
 
                 end % }}}
-                function flag = checkconsistency(obj,md) % {{{
+                function flag = checkconsistency(obj,md,solution,analyses) % {{{
 
                         fields={'g'};

issm/trunk/src/m/classes/diagnostic.m ¶

@@ -77 +77 @@
 
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
 
                         fields={'restol','maxiter'};

issm/trunk/src/m/classes/flaim.m ¶

@@ -41 +41 @@
 
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
 
-                        if md.private.solution~=FlaimSolutionEnum,
+                        if solution~=FlaimSolutionEnum,
                                 return;
                         end

issm/trunk/src/m/classes/flowequation.m ¶

@@ -41 +41 @@
 
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
 
                 end % }}}

issm/trunk/src/m/classes/friction.m ¶

@@ -36 +36 @@
 
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
 
                         fields={'coefficient','p','q'};

issm/trunk/src/m/classes/geometry.m ¶

@@ -38 +38 @@
 
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
                         fields={'surface','thickness','bed'};
                         checknan(md,'geometry',fields);

issm/trunk/src/m/classes/groundingline.m ¶

@@ -42 +42 @@
 
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
 
                         if ~ismember({obj.migration},{'None' 'AgressiveMigration' 'SoftMigration'}),

issm/trunk/src/m/classes/hydrology.m ¶

@@ -49 +49 @@
                         obj.stabilization=1;
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
 
                 end % }}}

issm/trunk/src/m/classes/initialization.m ¶

@@ -41 +41 @@
 
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
 
                 end % }}}

issm/trunk/src/m/classes/inversion.m ¶

@@ -86 +86 @@
 
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
 
                         %Early return
@@ -124 +124 @@
 
                         %OBSERVED VELOCITIES
-                        if md.private.solution==BalancethicknessSolutionEnum
+                        if solution==BalancethicknessSolutionEnum
                                 fields={'thickness_obs'};
                                 checksize(md,'inversion',fields,[md.mesh.numberofvertices 1]);

issm/trunk/src/m/classes/mask.m ¶

@@ -39 +39 @@
 
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
 
                         fields=properties('mask');

issm/trunk/src/m/classes/materials.m ¶

@@ -75 +75 @@
                         obj.rheology_law='Paterson';
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
                         fields={'rho_ice','rho_water','rheology_B','rheology_n'};
                         checknan(md,'materials',fields);

issm/trunk/src/m/classes/mesh.m ¶

@@ -78 +78 @@
                         obj.average_vertex_connectivity=25;
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
 
                         fields={'x','y','z','elements','elementonbed','elementonsurface','vertexonbed','vertexonsurface','elementconnectivity'};
@@ -118 +118 @@
 
                         %Solution specific checks
-                        switch(md.private.solution),
+                        switch(solution),
                                 case PrognosticSolutionEnum,
                                         if md.prognostic.stabilization==3,

issm/trunk/src/m/classes/miscellaneous.m ¶

@@ -26 +26 @@
                         end
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
 
                         fields={'name'};

issm/trunk/src/m/classes/private.m ¶

@@ -36 +36 @@
 
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
 
                 end % }}}

issm/trunk/src/m/classes/prognostic.m ¶

@@ -46 +46 @@
                         obj.hydrostatic_adjustment='Absolute';
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
                         if ~ismember(obj.stabilization,[0 1 3]),
                                 checkmessage('prognostic.stabilization should be a scalar (0 or 1 or 3)');

issm/trunk/src/m/classes/qmu.m ¶

@@ -48 +48 @@
                         end
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
 
                         %Early return

issm/trunk/src/m/classes/rifts.m ¶

@@ -35 +35 @@
                         end
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
                         if obj.numrifts,
                                 if ~(md.mesh.dimension==2),

issm/trunk/src/m/classes/settings.m ¶

@@ -52 +52 @@
                         obj.waitonlock=Inf;
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
 
                         fields={'lowmem'};

issm/trunk/src/m/classes/solver.m ¶

@@ -27 +27 @@
                  end
                  %}}}
-                 function checkconsistency(obj,md) % {{{
+                 function checkconsistency(obj,md,solution,analyses) % {{{
 
                  end % }}}

issm/trunk/src/m/classes/steadystate.m ¶

@@ -41 +41 @@
                         obj.reltol=0.01;
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
 
                         %Early return
-                        if md.private.solution~=SteadystateSolutionEnum, return; end;
+                        if solution~=SteadystateSolutionEnum, return; end;
 
                         if md.timestepping.time_step~=0,

issm/trunk/src/m/classes/surfaceforcings.m ¶

@@ -35 +35 @@
                         end
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
 
                 end % }}}

issm/trunk/src/m/classes/thermal.m ¶

@@ -50 +50 @@
                         obj.penalty_factor=3;
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
                         if ~ismember(obj.stabilization,[0 1 2]),
                                 checkmessage('thermal.stabilization should be a scalar (0 or 1 or 2)');

issm/trunk/src/m/classes/timestepping.m ¶

@@ -46 +46 @@
                         obj.cfl_coefficient=.5;
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
                         if ~ismember(md.timestepping.time_adapt,[0 1]),
                                 checkmessage(['model not consistent: model ' md.miscellaneous.name ' time_adapt field should be 0 or 1']);

issm/trunk/src/m/classes/transient.m ¶

@@ -44 +44 @@
 
                 end % }}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
                         if ~ismember(md.transient.isdiagnostic,[0 1]),
                                 checkmessage('model not consistent: transient.isdiagnostic should be a scalar (1 or 0)');

issm/trunk/src/m/classes/verbose.m ¶

@@ -99 +99 @@
                 end
                 %}}}
-                function checkconsistency(obj,md) % {{{
+                function checkconsistency(obj,md,solution,analyses) % {{{
 
                 end % }}}

issm/trunk/src/m/model/ismodelselfconsistent.m ¶

@@ -8 +8 @@
 modelconsistency(true);
 
+%Get solution and associated analyses
+solution=md.private.solution;
+[analyses,numanalyses]=AnalysisConfiguration(solution);
+
 %Go through al model field check that it is a class and call checkconsistency
 fields=properties(md);
 for i=1:length(fields),
         field=fields{i};
+
+        %Some properties do not need to be checked
         if ismember(field,{'results' 'debug' 'radaroverlay'}),
                 continue;
         end
+
+        %Check that current field is an object
         if ~isobject(md.(field))
                 checkmessage(['field ''' char(field) ''' is not an object']);
-        else
-                md.(field).checkconsistency(md);
         end
+
+        %Check consistency of the object
+        md.(field).checkconsistency(md,solution,analyses);
 end