Index: /issm/trunk/src/m/classes/inversion.m =================================================================== --- /issm/trunk/src/m/classes/inversion.m (revision 9820) +++ /issm/trunk/src/m/classes/inversion.m (revision 9821) @@ -161,5 +161,5 @@ fielddisplay(obj,'vel_obs','observed velocity magnitude [m/a]'); fielddisplay(obj,'thickness_obs','observed thickness [m]'); - disp('Available responses:'); + disp('Available cost functions:'); disp(' 101: SurfaceAbsVelMisfit'); disp(' 102: SurfaceRelVelMisfit'); Index: /issm/trunk/src/m/classes/mesh.m =================================================================== --- /issm/trunk/src/m/classes/mesh.m (revision 9820) +++ /issm/trunk/src/m/classes/mesh.m (revision 9821) @@ -6,43 +6,43 @@ classdef mesh properties (SetAccess=public) - x = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); - y = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); - z = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); - elements = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',2); - dimension = modelfield('default',0,'marshall',true,'format','Integer'); - numberoflayers = modelfield('default',0,'marshall',true,'format','Integer'); - numberofelements = modelfield('default',0,'marshall',true,'format','Integer'); - numberofvertices = modelfield('default',0,'marshall',true,'format','Integer'); - numberofedges = modelfield('default',0,'marshall',true,'format','Integer'); + x = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); + y = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); + z = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); + elements = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',2); + dimension = modelfield('default',0,'marshall',true,'format','Integer'); + numberoflayers = modelfield('default',0,'marshall',true,'format','Integer'); + numberofelements = modelfield('default',0,'marshall',true,'format','Integer'); + numberofvertices = modelfield('default',0,'marshall',true,'format','Integer'); + numberofedges = modelfield('default',0,'marshall',true,'format','Integer'); - lat = modelfield('default',NaN,'marshall',false); - long = modelfield('default',NaN,'marshall',false); - hemisphere = modelfield('default',NaN,'marshall',false); - - elementonbed = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',2); - elementonsurface = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',2); - vertexonbed = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',1); - vertexonsurface = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',1); - lowerelements = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',2); - lowervertex = modelfield('default',NaN,'marshall',false); - upperelements = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',2); - uppervertex = modelfield('default',NaN,'marshall',false); - vertexonboundary = modelfield('default',NaN,'marshall',false); - - edges = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3); - segments = modelfield('default',NaN,'marshall',false); - segmentmarkers = modelfield('default',NaN,'marshall',false); - vertexconnectivity = modelfield('default',NaN,'marshall',false); - elementconnectivity = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3); + lat = modelfield('default',NaN,'marshall',false); + long = modelfield('default',NaN,'marshall',false); + hemisphere = modelfield('default',NaN,'marshall',false); + + elementonbed = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',2); + elementonsurface = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',2); + vertexonbed = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',1); + vertexonsurface = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',1); + lowerelements = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',2); + lowervertex = modelfield('default',NaN,'marshall',false); + upperelements = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',2); + uppervertex = modelfield('default',NaN,'marshall',false); + vertexonboundary = modelfield('default',NaN,'marshall',false); + + edges = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3); + segments = modelfield('default',NaN,'marshall',false); + segmentmarkers = modelfield('default',NaN,'marshall',false); + vertexconnectivity = modelfield('default',NaN,'marshall',false); + elementconnectivity = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3); average_vertex_connectivity = modelfield('default',0,'marshall',true,'format','Integer'); - x2d = modelfield('default',NaN,'marshall',false); - y2d = modelfield('default',NaN,'marshall',false); - elements2d = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3); - numberofvertices2d = modelfield('default',0,'marshall',true,'format','Integer'); - numberofelements2d = modelfield('default',0,'marshall',true,'format','Integer'); - - extractedvertices = modelfield('default',NaN,'marshall',false); - extractedelements = modelfield('default',NaN,'marshall',false); + x2d = modelfield('default',NaN,'marshall',false); + y2d = modelfield('default',NaN,'marshall',false); + elements2d = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3); + numberofvertices2d = modelfield('default',0,'marshall',true,'format','Integer'); + numberofelements2d = modelfield('default',0,'marshall',true,'format','Integer'); + + extractedvertices = modelfield('default',NaN,'marshall',false); + extractedelements = modelfield('default',NaN,'marshall',false); end methods @@ -170,4 +170,5 @@ fielddisplay(obj,'z','vertices z coordinate'); fielddisplay(obj,'edges','edges of the 2d mesh (vertex1 vertex2 element1 element2)'); + fielddisplay(obj,'numberofedges','number of edges of the 2d mesh'); disp(sprintf('\n Properties:')); @@ -178,4 +179,24 @@ fielddisplay(obj,'vertexonsurface','upper vertices flags list'); fielddisplay(obj,'elementonsurface','upper elements flags list'); + fielddisplay(obj,'uppervertex','upper vertex list (NaN for vertex on the upper surface)'); + fielddisplay(obj,'upperelement','upper element list (NaN for element on the upper layer)'); + fielddisplay(obj,'lowervertex','lower vertex list (NaN for vertex on the lower surface)'); + fielddisplay(obj,'lowerelement','lower element list (NaN for element on the lower layer'); + fielddisplay(obj,'vertexonboundary','vertices on the boundary of the domain flag list'); + + fielddisplay(obj,'segments','edges on domain boundary (vertex1 vertex2 element)'); + fielddisplay(obj,'segmentsmarkers','number associated to each segment'); + fielddisplay(obj,'vertexconnectivity','list of vertices connected to vertex_i'); + fielddisplay(obj,'elementconnectivity','list of vertices connected to element_i'); + fielddisplay(obj,'average_vertex_connectivity','average number of vertices connected to one vertex'); + + disp(sprintf('\n Extracted model:')); + fielddisplay(obj,'extractedvertices','vertices extracted from the model'); + fielddisplay(obj,'extractedelements','elements extracted from the model'); + + disp(sprintf('\n Projection:')); + fielddisplay(obj,'lat','vertices latitude'); + fielddisplay(obj,'long','vertices longitude'); + fielddisplay(obj,'hemisphere','Indicate hemisphere ''n'' or ''s'' '); end % }}} end Index: /issm/trunk/src/m/classes/miscellaneous.m =================================================================== --- /issm/trunk/src/m/classes/miscellaneous.m (revision 9820) +++ /issm/trunk/src/m/classes/miscellaneous.m (revision 9821) @@ -41,4 +41,12 @@ end end % }}} + function disp(obj) % {{{ + disp(sprintf(' miscellaneous parameters:')); + + fielddisplay(obj,'notes','notes in a cell of strings'); + fielddisplay(obj,'name','model name'); + fielddisplay(obj,'dummy','empty field to store some data'); + + end % }}} end end Index: /issm/trunk/src/m/classes/private.m =================================================================== --- /issm/trunk/src/m/classes/private.m (revision 9820) +++ /issm/trunk/src/m/classes/private.m (revision 9821) @@ -39,4 +39,12 @@ end % }}} + function disp(obj) % {{{ + disp(sprintf(' private parameters: do not change')); + + fielddisplay(obj,'runtimename','name of the run launched'); + fielddisplay(obj,'bamg','structure with mesh properties construced if bamg is used to mesh the domain'); + fielddisplay(obj,'solution','type of solution launched'); + + end % }}} end end Index: /issm/trunk/src/m/classes/prognostic.m =================================================================== --- /issm/trunk/src/m/classes/prognostic.m (revision 9820) +++ /issm/trunk/src/m/classes/prognostic.m (revision 9821) @@ -57,10 +57,11 @@ function disp(obj) % {{{ disp(sprintf(' Prognostic solution parameters:')); - - disp(sprintf('\n transient:')); + fielddisplay(obj,'spcthickness','thickness constraints (NaN means no constraint)'); + fielddisplay(obj,'hydrostatic_adjustment','adjustment of ice shelves surface and bed elevations: ''Incremental'' or ''Absolute'' '); fielddisplay(obj,'stabilization','0->no, 1->artificial_diffusivity, 3->discontinuous Galerkin'); - disp(sprintf('\n boundary conditions:')); - fielddisplay(obj,'spcthickness','thickness constraints (NaN means no constraint)'); + disp(sprintf('\n %s','Penalty options:')); + fielddisplay(obj,'penalty_factor','offset used by penalties: penalty = Kmax*10^offset'); + fielddisplay(obj,'vertex_pairing','pairs of vertices that are penalized'); end % }}} Index: /issm/trunk/src/m/classes/qmu.m =================================================================== --- /issm/trunk/src/m/classes/qmu.m (revision 9820) +++ /issm/trunk/src/m/classes/qmu.m (revision 9821) @@ -6,4 +6,5 @@ classdef qmu properties (SetAccess=public) + isdakota = modelfield('default',0,'marshall',true,'format','Boolean'); variables = modelfield('default',struct(),'marshall',false); responses = modelfield('default',struct(),'marshall',false); @@ -11,5 +12,4 @@ params = modelfield('default',struct(),'marshall',false); results = modelfield('default',struct(),'marshall',false); - isdakota = modelfield('default',0,'marshall',true,'format','Boolean'); partition = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',2); numberofpartitions = modelfield('default',0,'marshall',true,'format','Integer'); @@ -87,7 +87,7 @@ end % }}} function disp(obj) % {{{ + disp(sprintf(' qmu parameters:')); fielddisplay(obj,'isdakota','is qmu analysis activated?'); - for i=1:numel(obj.variables) disp(sprintf(' variables%s: (arrays of each variable class)',... @@ -104,6 +104,4 @@ end end - - for i=1:numel(obj.responses) disp(sprintf(' responses%s: (arrays of each response class)',... @@ -120,7 +118,5 @@ end end - - - disp(sprintf(' qmu_method: (array of dakota_method class)')); + fielddisplay(obj,'numberofresponses','number of responses') for i=1:numel(obj.method); if strcmp(class(obj.method(i)),'dakota_method') @@ -129,5 +125,4 @@ end end - for i=1:numel(obj.params) disp(sprintf(' qmu_params%s: (array of method-independent parameters)',... @@ -144,5 +139,4 @@ end end - for i=1:numel(obj.results) disp(sprintf(' results%s: (information from dakota files)',... @@ -159,7 +153,15 @@ end end + fielddisplay(obj,'partition','user provided mesh partitionition, defaults to metis if not specified') + fielddisplay(obj,'numberofpartitions','number of partitions for semi-descrete qmu') + fielddisplay(obj,'variabledescriptors',''); + fielddisplay(obj,'responsedescriptors',''); + fielddisplay(obj,'method','array of dakota_method class'); + fielddisplay(obj,'mass_flux_profile_directory','directory for mass flux profiles'); + fielddisplay(obj,'mass_flux_profiles','list of mass_flux profiles'); + fielddisplay(obj,'mass_flux_segments',''); + fielddisplay(obj,'adjacency',''); + fielddisplay(obj,'vertex_weight','weight applied to each mesh vertex'); - disp(sprintf(' numberofpartitions : %i (number of partitions for semi-descrete qmu)',obj.numberofpartitions)); - disp(sprintf(' partition : [%i] (user provided mesh partitionition, defaults to metis if not specified)',length(obj.partition))); end % }}} end Index: /issm/trunk/src/m/classes/radaroverlay.m =================================================================== --- /issm/trunk/src/m/classes/radaroverlay.m (revision 9820) +++ /issm/trunk/src/m/classes/radaroverlay.m (revision 9821) @@ -35,4 +35,12 @@ end end % }}} + function disp(obj) % {{{ + disp(sprintf(' radaroverlay parameters:')); + + fielddisplay(obj,'pwr','radar power image (matrix)'); + fielddisplay(obj,'x','corresponding x coordinates'); + fielddisplay(obj,'y','corresponding y coordinates'); + + end % }}} end end Index: /issm/trunk/src/m/classes/rifts.m =================================================================== --- /issm/trunk/src/m/classes/rifts.m (revision 9820) +++ /issm/trunk/src/m/classes/rifts.m (revision 9821) @@ -55,4 +55,12 @@ end end % }}} + function disp(obj) % {{{ + disp(sprintf(' rifts parameters:')); + + fielddisplay(obj,'numrifts','number of of rifts'); + fielddisplay(obj,'riftstruct','structure containing all rift information (vertices coordinates, segments, type of melange, ...)'); + fielddisplay(obj,'riftproperties',''); + + end % }}} end end Index: /issm/trunk/src/m/classes/settings.m =================================================================== --- /issm/trunk/src/m/classes/settings.m (revision 9820) +++ /issm/trunk/src/m/classes/settings.m (revision 9821) @@ -59,4 +59,14 @@ end % }}} + function disp(obj) % {{{ + disp(sprintf(' general settings parameters:')); + + fielddisplay(obj,'io_gather','I/O gathering strategy for result outputs (default 1)'); + fielddisplay(obj,'lowmem','is the memory limited ? (0 or 1)'); + fielddisplay(obj,'results_on_vertices','provide results on vertices instead of patch (0 or 1)'); + fielddisplay(obj,'output_frequency','frequency at which results are saved in all solutions with multiple time_steps'); + fielddisplay(obj,'waitonlock','maximum number of minutes to wait for batch results, or return 0'); + + end % }}} end end Index: /issm/trunk/src/m/classes/solver.m =================================================================== --- /issm/trunk/src/m/classes/solver.m (revision 9820) +++ /issm/trunk/src/m/classes/solver.m (revision 9821) @@ -9,17 +9,4 @@ end methods - function disp(obj) % {{{1 - % display the object - disp(sprintf('class ''%s'' object ''%s'' = \n',class(o),inputname(1))); - % display the options - for i=1:size(obj.options,1), - analysis=obj.options{i,1}; - ioptions=obj.options{i,2}; - string=PetscString(ioptions); - disp(sprintf(' %s -> ''%s''',EnumToString(analysis),string)); - end - disp(sprintf('\n')); - end - %}}} function obj=addoptions(obj,analysis,solveroptions) % {{{1 %first, find out if analysis has already been supplied @@ -119,4 +106,15 @@ end end % }}} + function disp(obj) % {{{1 + disp(sprintf(' solver parameters:')); + + for i=1:size(obj.options,1), + analysis=obj.options{i,1}; + ioptions=obj.options{i,2}; + string=PetscString(ioptions); + disp(sprintf(' %s -> ''%s''',EnumToString(analysis),string)); + end + end + %}}} end end Index: /issm/trunk/src/m/classes/steadystate.m =================================================================== --- /issm/trunk/src/m/classes/steadystate.m (revision 9820) +++ /issm/trunk/src/m/classes/steadystate.m (revision 9821) @@ -54,4 +54,12 @@ end end % }}} + function disp(obj) % {{{ + disp(sprintf(' steadystate solution parameters:')); + + fielddisplay(obj,'reltol','relative tolerance criterion'); + fielddisplay(obj,'maxiter','maximum number of iterations'); + fielddisplay(obj,'requested_outputs','additional requested outputs'); + + end % }}} end end Index: /issm/trunk/src/m/classes/surfaceforcings.m =================================================================== --- /issm/trunk/src/m/classes/surfaceforcings.m (revision 9820) +++ /issm/trunk/src/m/classes/surfaceforcings.m (revision 9821) @@ -38,4 +38,12 @@ end % }}} + function disp(obj) % {{{ + disp(sprintf(' surface forcings parameters:')); + + fielddisplay(obj,'accumulation_rate','surface accumulation rate [m]'); + fielddisplay(obj,'ablation_rate','surface ablation rate [m]'); + fielddisplay(obj,'mass_balance','surface mass balance [m]'); + + end % }}} end end Index: /issm/trunk/src/m/classes/thermal.m =================================================================== --- /issm/trunk/src/m/classes/thermal.m (revision 9820) +++ /issm/trunk/src/m/classes/thermal.m (revision 9821) @@ -59,10 +59,9 @@ disp(sprintf(' Thermal solution parameters:')); - disp(sprintf('\n parameters:')); + fielddisplay(obj,'spctemperature','temperature constraints (NaN means no constraint)'); + fielddisplay(obj,'stabilization','0->no, 1->artificial_diffusivity, 2->SUPG'); + fielddisplay(obj,'maxiter','maximum number of non linear iterations'); fielddisplay(obj,'penalty_lock','stabilize unstable thermal constraints that keep zigzagging after n iteration (default is 0, no stabilization)'); fielddisplay(obj,'penalty_threshold','threshold to declare convergence of thermal solution (default is 0)'); - - disp(sprintf('\n boundary conditions:')); - fielddisplay(obj,'spctemperature','constraints flag list (first column) and values (second column)'); end % }}} Index: /issm/trunk/src/m/classes/timestepping.m =================================================================== --- /issm/trunk/src/m/classes/timestepping.m (revision 9820) +++ /issm/trunk/src/m/classes/timestepping.m (revision 9821) @@ -57,4 +57,13 @@ end end % }}} + function disp(obj) % {{{ + disp(sprintf(' timestepping parameters:')); + + fielddisplay(obj,'time_step','length of time steps [yrs]'); + fielddisplay(obj,'final_time','final time to stop the simulation [yrs]'); + fielddisplay(obj,'time_adapt','use cfl condition to define time step ? (0 or 1) '); + fielddisplay(obj,'cfl_coefficient','coefficient applied to cfl condition'); + + end % }}} end end Index: /issm/trunk/src/m/classes/transient.m =================================================================== --- /issm/trunk/src/m/classes/transient.m (revision 9820) +++ /issm/trunk/src/m/classes/transient.m (revision 9821) @@ -44,12 +44,4 @@ end % }}} - function disp(obj) % {{{ - disp('Transient parameters on a pure solution basis:'); - fielddisplay(obj,'isprognostic','indicates if a prognostic solution is used in the transient'); - fielddisplay(obj,'isthermal','indicates if a thermal solution is used in the transient'); - fielddisplay(obj,'isdiagnostic','indicates if a diagnostic solution is used in the transient'); - fielddisplay(obj,'isgroundingline','indicates if a groundingline migration is used in the transient'); - - end % }}} function checkconsistency(obj,md) % {{{ if ~ismember(md.transient.isdiagnostic,[0 1]), @@ -67,4 +59,13 @@ end % }}} + function disp(obj) % {{{ + disp(sprintf(' balance thickness solution parameters:')); + + fielddisplay(obj,'isprognostic','indicates if a prognostic solution is used in the transient'); + fielddisplay(obj,'isthermal','indicates if a thermal solution is used in the transient'); + fielddisplay(obj,'isdiagnostic','indicates if a diagnostic solution is used in the transient'); + fielddisplay(obj,'isgroundingline','indicates if a groundingline migration is used in the transient'); + + end % }}} end end