Index: /issm/trunk-jpl/src/m/classes/clusters/generic.py =================================================================== --- /issm/trunk-jpl/src/m/classes/clusters/generic.py (revision 25135) +++ /issm/trunk-jpl/src/m/classes/clusters/generic.py (revision 25136) @@ -163,5 +163,5 @@ fid.write('\n gprof {}/kriging.exe gmon.out>{}.performance'.format(self.codepath, modelname)) else: - #Add - - gen - suppressions = all to get suppression lines + #Add -- gen - suppressions = all to get suppression lines #fid.write('LD_PRELOAD={} \\\n'.format(self.valgrindlib)) fid.write('mpiexec -np {} {} --leak -check=full --suppressions={} {}/kriging.exe {}/{} {} 2 > {}.errlog > {}.outlog ' .format(self.np, self.valgrind, self.valgrindsup, self.codepath, self.executionpath, modelname, modelname, modelname, modelname)) Index: /issm/trunk-jpl/src/m/classes/giacaron.m =================================================================== --- /issm/trunk-jpl/src/m/classes/giacaron.m (revision 25135) +++ /issm/trunk-jpl/src/m/classes/giacaron.m (revision 25136) @@ -1,34 +1,34 @@ %GIA class definition for Caron model (Caron et al, Geophysical Journal International, 2017) % -% Usage: -% giacaron=giacaron(); +% Usage: +% giacaron=giacaron(); classdef giacaron properties (SetAccess=public) - - %Physical constants - gravitational_constant= NaN; - surface_radius = NaN; + + %Physical constants + gravitational_constant= NaN; + surface_radius = NaN; core_mantle_boudary_radius= NaN; - inner_core_boudary_radius= NaN; - stress_norm= NaN; - gravity_norm= NaN; - radius_norm= NaN; - - %Numerical parameters - allow_layer_deletion=NaN; - verbose_mode=NaN; - - %GIA problem setup - forcing_type=NaN; - isincompressible=NaN; - benchmark_mode=NaN; - calculate_sea_level=NaN; - calculate_rotational_feedback=NaN; - subtract_present_day=NaN; - ntime=NaN; - nphi=NaN; - - %Earth model - numlayers = NaN; + inner_core_boudary_radius= NaN; + stress_norm= NaN; + gravity_norm= NaN; + radius_norm= NaN; + + %Numerical parameters + allow_layer_deletion=NaN; + verbose_mode=NaN; + + %GIA problem setup + forcing_type=NaN; + isincompressible=NaN; + benchmark_mode=NaN; + calculate_sea_level=NaN; + calculate_rotational_feedback=NaN; + subtract_present_day=NaN; + ntime=NaN; + nphi=NaN; + + %Earth model + numlayers = NaN; radius = NaN; lame_mu = NaN; @@ -39,11 +39,11 @@ isburger = NaN; transient_viscosity = NaN; - transient_mu = NaN; - - %Ice history - ice_model_identifier=NaN; - ice_model_ntime=NaN; - nice_sheets=NaN; - + transient_mu = NaN; + + %Ice history + ice_model_identifier=NaN; + ice_model_ntime=NaN; + nice_sheets=NaN; + end methods @@ -58,5 +58,5 @@ if strcmpi(body,'earth'), self.numlayers=getfieldvalue(options,'numlayers',5); - self.calculate_sea_level=true; + self.calculate_sea_level=true; %[self.radius,self.lame_mu, self.lame_lambda, self.issolid, self.density, ... %self.viscosity, self.isburger, self.transient_viscosity, self.transient_mu]=... @@ -70,27 +70,27 @@ end % }}} function self = setdefaultparameters(self) % {{{ - %Physical constants - gravitational_constant= 6.67259e-11; - stress_norm= 1e12; - gravity_norm= 10; - radius_norm= 1.0; - - %Numerical parameters - allow_layer_deletion=true; - verbose_mode=false; - - %GIA problem setup - forcing_type=11; - isincompressible=false; - benchmark_mode=false; - calculate_sea_level=false; - calculate_rotational_feedback=true; - subtract_present_day=true; - - %Earth model - isburger = false(self.numlayers,1); - - %Ice history - nice_sheets=1; + %Physical constants + gravitational_constant= 6.67259e-11; + stress_norm= 1e12; + gravity_norm= 10; + radius_norm= 1.0; + + %Numerical parameters + allow_layer_deletion=true; + verbose_mode=false; + + %GIA problem setup + forcing_type=11; + isincompressible=false; + benchmark_mode=false; + calculate_sea_level=false; + calculate_rotational_feedback=true; + subtract_present_day=true; + + %Earth model + isburger = false(self.numlayers,1); + + %Ice history + nice_sheets=1; end % }}} @@ -98,7 +98,7 @@ if ~ismember('GiaAnalysis',analyses), return; end - % Physical constants - md = checkfield(md,'fieldname','gia.gravitational_constant','NaN',1,'Inf',1,'numel',1,'>',0); - md = checkfield(md,'fieldname','gia.surface_radius','NaN',1,'Inf',1,'numel',1,'>',0); + % Physical constants + md = checkfield(md,'fieldname','gia.gravitational_constant','NaN',1,'Inf',1,'numel',1,'>',0); + md = checkfield(md,'fieldname','gia.surface_radius','NaN',1,'Inf',1,'numel',1,'>',0); md = checkfield(md,'fieldname','gia.core_mantle_boundary_radius','Inf',1,'numel',1,'>',0); md = checkfield(md,'fieldname','gia.inner_core_boundary_radius','Inf',1,'numel',1,'>',0); @@ -107,25 +107,25 @@ md = checkfield(md,'fieldname','gia.gravity_norm','NaN',1,'Inf',1,'numel',1,'>',0); - %Numerical parameters - md = checkfield(md,'fieldname','gia.allow_layer_deletion','values',[0 1]); + %Numerical parameters + md = checkfield(md,'fieldname','gia.allow_layer_deletion','values',[0 1]); md = checkfield(md,'fieldname','gia.verbose_mode','values',[0 1]); - %GIA problem setup - md = checkfield(md,'fieldname','gia.forcing_type','NaN',1,'Inf',1,'numel',1,'>',0, '<=', 12); - md = checkfield(md,'fieldname','gia.isincompressible','values',[0 1]); - md = checkfield(md,'fieldname','gia.benchmark_mode','values',[0 1]); - md = checkfield(md,'fieldname','gia.calculate_sea_level','values',[0 1]); - md = checkfield(md,'fieldname','gia.calculate_rotational_feedback','values',[0 1]); - md = checkfield(md,'fieldname','gia.subtract_present_day','values',[0 1]); - md = checkfield(md,'fieldname','gia.ntime','NaN',1,'Inf',1,'numel',1,'>',0); - md = checkfield(md,'fieldname','gia.ntheta','NaN',1,'Inf',1,'numel',1,'>',0); - md = checkfield(md,'fieldname','gia.nphi','numel',1,'values', self.ntheta*2); - - %Ice history - md = checkfield(md,'fieldname','gia.ice_model_identifier', 'stringrow', 1, 'size', [1 3]); - md = checkfield(md,'fieldname','gia.ice_model_ntime', 'NaN', 1, 'Inf', 1, 'numel', 1); - md = checkfield(md,'fieldname','gia.nice_sheets', 'NaN', 1, 'Inf', 1, '>', 0, 'numel', 1); - - %Earth parameters + %GIA problem setup + md = checkfield(md,'fieldname','gia.forcing_type','NaN',1,'Inf',1,'numel',1,'>',0, '<=', 12); + md = checkfield(md,'fieldname','gia.isincompressible','values',[0 1]); + md = checkfield(md,'fieldname','gia.benchmark_mode','values',[0 1]); + md = checkfield(md,'fieldname','gia.calculate_sea_level','values',[0 1]); + md = checkfield(md,'fieldname','gia.calculate_rotational_feedback','values',[0 1]); + md = checkfield(md,'fieldname','gia.subtract_present_day','values',[0 1]); + md = checkfield(md,'fieldname','gia.ntime','NaN',1,'Inf',1,'numel',1,'>',0); + md = checkfield(md,'fieldname','gia.ntheta','NaN',1,'Inf',1,'numel',1,'>',0); + md = checkfield(md,'fieldname','gia.nphi','numel',1,'values', self.ntheta*2); + + %Ice history + md = checkfield(md,'fieldname','gia.ice_model_identifier', 'stringrow', 1, 'size', [1 3]); + md = checkfield(md,'fieldname','gia.ice_model_ntime', 'NaN', 1, 'Inf', 1, 'numel', 1); + md = checkfield(md,'fieldname','gia.nice_sheets', 'NaN', 1, 'Inf', 1, '>', 0, 'numel', 1); + + %Earth parameters md = checkfield(md,'fieldname','gia.numlayers','NaN',1,'Inf',1,'>',0,'numel',1); md = checkfield(md,'fieldname','gia.radius','NaN',1,'Inf',1,'size',[md.gia.numlayers 1],'>',0); @@ -141,8 +141,8 @@ function disp(self) % {{{ disp(sprintf(' giacaron parameters:')); - - % Physical constants - fielddisplay(self,'gravitational_constant', 'Newton''s Gravitational constant, should be equal to approximately 6.67e-11 [m^3.kg^-1.s^-2]'); - fielddisplay(self,'surface_radius','NaN', 'Planet outer surface radius [m]'); + + % Physical constants + fielddisplay(self,'gravitational_constant', 'Newton''s Gravitational constant, should be equal to approximately 6.67e-11 [m^3.kg^-1.s^-2]'); + fielddisplay(self,'surface_radius','NaN', 'Planet outer surface radius [m]'); fielddisplay(self,'core_mantle_boundary_radius', 'Planet core mantle boundary radius (optional) [m]'); fielddisplay(self,'inner_core_boundary_radius','Planet inner core boundary radius (optional) [m]'); @@ -151,25 +151,25 @@ fielddisplay(self,'gravity_norm', 'gravity normalization constant [m.s^-2] (default 10)'); - %Numerical parameters - fielddisplay(self,'allow_layer_deletion', 'boolean allowing the migration of the starting integration radius while increasing the spherical harmonic degree (default true)'); + %Numerical parameters + fielddisplay(self,'allow_layer_deletion', 'boolean allowing the migration of the starting integration radius while increasing the spherical harmonic degree (default true)'); fielddisplay(self,'verbose_mode', 'boolean allowing the program to write more details on terminal (default false)') - %GIA problem setup - fielddisplay(self,'forcing_type','integer indicating the nature and depth of the forcing for the Love number calculation: 1: ICB -- Volumic Potential, 2: ICB -- Pressure, 3: ICB -- Loading, 4: ICB -- Tangential traction, 5: CMB -- Volumic Potential, 6: CMB -- Pressure 7: CMB -- Loading, 8: CMB -- Tangential traction, 9: SURF -- Volumic Potential, 10: SURF -- Pressure, 11: SURF -- Loading, 12: SURF -- Tangential traction (default 11)'); - fielddisplay(self,'isincompressible', 'boolean approximating the mantle rheology to an incompressible body, sets Lame_lambda to 5e14 Pa (default false)'); - fielddisplay(self,'benchmark_mode', 'boolean to enter benchmark mode, writes a lot of outputs from the midst of the calculation (default false)'); - fielddisplay(self,'calculate_sea_level', 'boolean allowing the sea level equation solving (default false)'); - fielddisplay(self,'calculate_rotational_feedback', 'boolean allowing the calculation of rotational feedback (default true)'); - fielddisplay(self,'subtract_present_day', 'boolean, subtracts the present day signal so the calculation is expressed as the difference with the present-day topography, geoid and sea level (default true)'); - fielddisplay(self,'ntime', 'number of time steps') - fielddisplay(self,'ntheta', 'size of grid in latitude') - fielddisplay(self,'nphi', 'size of grid in longitude (should always be ntheta*2)'); - - %Ice history - fielddisplay(self,'ice_model_identifier', 'string identifier for the ice model (3 characters)') - fielddisplay(self,'ice_model_ntime', 'number of time steps in the original ice model, is used to interpolate the model on the desired time') - fielddisplay(self,'nice_sheets', 'number of ice regions to be scaled independently') - - %Earth parameters + %GIA problem setup + fielddisplay(self,'forcing_type','integer indicating the nature and depth of the forcing for the Love number calculation: 1: ICB -- Volumic Potential, 2: ICB -- Pressure, 3: ICB -- Loading, 4: ICB -- Tangential traction, 5: CMB -- Volumic Potential, 6: CMB -- Pressure 7: CMB -- Loading, 8: CMB -- Tangential traction, 9: SURF -- Volumic Potential, 10: SURF -- Pressure, 11: SURF -- Loading, 12: SURF -- Tangential traction (default 11)'); + fielddisplay(self,'isincompressible', 'boolean approximating the mantle rheology to an incompressible body, sets Lame_lambda to 5e14 Pa (default false)'); + fielddisplay(self,'benchmark_mode', 'boolean to enter benchmark mode, writes a lot of outputs from the midst of the calculation (default false)'); + fielddisplay(self,'calculate_sea_level', 'boolean allowing the sea level equation solving (default false)'); + fielddisplay(self,'calculate_rotational_feedback', 'boolean allowing the calculation of rotational feedback (default true)'); + fielddisplay(self,'subtract_present_day', 'boolean, subtracts the present day signal so the calculation is expressed as the difference with the present-day topography, geoid and sea level (default true)'); + fielddisplay(self,'ntime', 'number of time steps') + fielddisplay(self,'ntheta', 'size of grid in latitude') + fielddisplay(self,'nphi', 'size of grid in longitude (should always be ntheta*2)'); + + %Ice history + fielddisplay(self,'ice_model_identifier', 'string identifier for the ice model (3 characters)') + fielddisplay(self,'ice_model_ntime', 'number of time steps in the original ice model, is used to interpolate the model on the desired time') + fielddisplay(self,'nice_sheets', 'number of ice regions to be scaled independently') + + %Earth parameters fielddisplay(self,'numlayers','number of layers (default 5)'); fielddisplay(self,'radius','array describing the radius for each interface (numlayers+1) [m]'); @@ -189,6 +189,6 @@ WriteData(fid,prefix,'object',self,'fieldname','lithosphere_thickness','format','DoubleMat','mattype',1,'scale',10^3); %from km to m WriteData(fid,prefix,'object',self,'fieldname','cross_section_shape','format','Integer'); - - %Physical constants + + %Physical constants WriteData(fid,prefix,'object',self,'fieldname','gravitational_constant','format','Double'); WriteData(fid,prefix,'object',self,'fieldname','surface_radius ','format','Double'); @@ -198,10 +198,10 @@ WriteData(fid,prefix,'object',self,'fieldname','gravity_norm','format','Double'); WriteData(fid,prefix,'object',self,'fieldname','radius_norm','format','Double'); - - %Numerical parameters + + %Numerical parameters WriteData(fid,prefix,'object',self,'fieldname','allow_layer_deletion','format','Boolean'); WriteData(fid,prefix,'object',self,'fieldname','verbose_mode','format','Boolean'); - - %GIA problem setup + + %GIA problem setup WriteData(fid,prefix,'object',self,'fieldname','forcing_type','format','Integer'); WriteData(fid,prefix,'object',self,'fieldname','isincompressible','format','Boolean'); @@ -213,6 +213,6 @@ WriteData(fid,prefix,'object',self,'fieldname','ntheta','format','Integer'); WriteData(fid,prefix,'object',self,'fieldname','nphi','format','Integer'); - - %Earth model + + %Earth model WriteData(fid,prefix,'object',self,'fieldname','numlayers','format','Double'); WriteData(fid,prefix,'object',self,'fieldname','radius','format','DoubleMat','mattype',1); @@ -225,7 +225,7 @@ WriteData(fid,prefix,'object',self,'fieldname','transient_viscosity','format','DoubleMat','mattype',1); WriteData(fid,prefix,'object',self,'fieldname','transient_mu','format','DoubleMat','mattype',1); - - %Inversion -% dataset_type_dentifier= NaN + + %Inversion +% dataset_type_dentifier= NaN WriteData(fid,prefix,'object',self,'fieldname','ndata_std','format','Integer'); WriteData(fid,prefix,'object',self,'fieldname','ndata_minimum_val ','format','Integer'); @@ -235,6 +235,6 @@ WriteData(fid,prefix,'object',self,'fieldname','ice_coefficients_solving ','format','String'); WriteData(fid,prefix,'object',self,'fieldname','ninverse_parameters','format','Integer'); - - %Ice history + + %Ice history WriteData(fid,prefix,'object',self,'fieldname','ice_model_identifier','format','String'); WriteData(fid,prefix,'object',self,'fieldname','ice_model_ntime','format','Integer'); @@ -243,5 +243,5 @@ function savemodeljs(self,fid,modelname) % {{{ -%Physical constants + %Physical constants writejsdouble(fid,[modelname '.gia.gravitational_constant'],self.gravitational_constant); writejsdouble(fid,[modelname '.gia.surface_radius'],self.surface_radius); @@ -251,10 +251,10 @@ writejsdouble(fid,[modelname '.gia.gravity_norm'],self.gravity_norm); writejsdouble(fid,[modelname '.gia.radius_norm'],self.radius_norm); - - %Numerical parameters + + %Numerical parameters writejsdouble(fid,[modelname '.gia.allow_layer_deletion'],self.allow_layer_deletion); writejsdouble(fid,[modelname '.gia.verbose_mode'],self.verbose_mode); - - %GIA problem setup + + %GIA problem setup writejsdouble(fid,[modelname '.gia.forcing_type'],self.forcing_type); writejsdouble(fid,[modelname '.gia.isincompressible'],self.isincompressible); @@ -266,6 +266,6 @@ writejsdouble(fid,[modelname '.gia.ntheta'],self.ntheta); writejsdouble(fid,[modelname '.gia.nphi'],self.nphi); - - %Earth model + + %Earth model writejsdouble(fid,[modelname '.gia.numlayers'],self.numlayers); writejsdouble(fid,[modelname '.gia.radius'],self.radius); @@ -278,7 +278,7 @@ writejsdouble(fid,[modelname '.gia.transient_viscosity'],self.transient_viscosity); writejsdouble(fid,[modelname '.gia.transient_mu'],self.transient_mu); - - %Inversion -% dataset_type_dentifier= NaN + + %Inversion +% dataset_type_dentifier= NaN % writejsdouble(fid,[modelname '.gia.ndata_std'],self.ndata_std); % writejsdouble(fid,[modelname '.gia.ndata_minimum_val'],self.ndata_minimum_val); @@ -288,6 +288,6 @@ % writejsdouble(fid,[modelname '.gia.ice_coefficients_solving'],self.ice_coefficients_solving); % writejsdouble(fid,[modelname '.gia.ninverse_parameters'],self.ninverse_parameters); - - %Ice history + + %Ice history writejsdouble(fid,[modelname '.gia.ice_model_identifier'],self.ice_model_identifier); writejsdouble(fid,[modelname '.gia.ice_model_ntime'],self.ice_model_ntime); Index: /issm/trunk-jpl/src/m/classes/giaivins.py =================================================================== --- /issm/trunk-jpl/src/m/classes/giaivins.py (revision 25135) +++ /issm/trunk-jpl/src/m/classes/giaivins.py (revision 25136) @@ -29,8 +29,8 @@ def __repr__(self): #{{{ - s = ' giaivins solution parameters:' - s += "{}\n".format(fielddisplay(self, 'mantle_viscosity', 'mantle viscosity constraints (NaN means no constraint) (Pa s)')) - s += "{}\n".format(fielddisplay(self, 'lithosphere_thickness', 'lithosphere thickness constraints (NaN means no constraint) (m)')) - s += "{}\n".format(fielddisplay(self, 'cross_section_shape', "1: square-edged, 2: elliptical-sedged surface")) + s = ' giaivins parameters:\n' + s += "{}\n".format(fielddisplay(self, 'mantle_viscosity', 'mantle viscosity [Pa s]')) + s += "{}\n".format(fielddisplay(self, 'lithosphere_thickness', 'lithosphere thickness (km)')) + s += "{}\n".format(fielddisplay(self, 'cross_section_shape', "1: square-edged (default). 2: elliptical. See iedge in GiaDeflectionCore")) return s Index: /issm/trunk-jpl/src/m/classes/model.py =================================================================== --- /issm/trunk-jpl/src/m/classes/model.py (revision 25135) +++ /issm/trunk-jpl/src/m/classes/model.py (revision 25136) @@ -182,46 +182,46 @@ def __repr__(obj): #{{{ #print "Here %s the number: %d" % ("is", 37) - string = "%19s: % - 22s - - %s" % ("mesh", "[%s, %s]" % ("1x1", obj.mesh.__class__.__name__), "mesh properties") - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("mask", "[%s, %s]" % ("1x1", obj.mask.__class__.__name__), "defines grounded and floating elements")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("geometry", "[%s, %s]" % ("1x1", obj.geometry.__class__.__name__), "surface elevation, bedrock topography, ice thickness, ...")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("constants", "[%s, %s]" % ("1x1", obj.constants.__class__.__name__), "physical constants")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("smb", "[%s, %s]" % ("1x1", obj.smb.__class__.__name__), "surface mass balance")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("basalforcings", "[%s, %s]" % ("1x1", obj.basalforcings.__class__.__name__), "bed forcings")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("materials", "[%s, %s]" % ("1x1", obj.materials.__class__.__name__), "material properties")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("damage", "[%s, %s]" % ("1x1", obj.damage.__class__.__name__), "damage propagation laws")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("friction", "[%s, %s]" % ("1x1", obj.friction.__class__.__name__), "basal friction / drag properties")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("flowequation", "[%s, %s]" % ("1x1", obj.flowequation.__class__.__name__), "flow equations")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("timestepping", "[%s, %s]" % ("1x1", obj.timestepping.__class__.__name__), "time stepping for transient models")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("initialization", "[%s, %s]" % ("1x1", obj.initialization.__class__.__name__), "initial guess / state")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("rifts", "[%s, %s]" % ("1x1", obj.rifts.__class__.__name__), "rifts properties")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("solidearth", "[%s, %s]" % ("1x1", obj.solidearth.__class__.__name__), "solid earth inputs and settings")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("dsl", "[%s, %s]" % ("1x1", obj.dsl.__class__.__name__), "dynamic sea level")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("debug", "[%s, %s]" % ("1x1", obj.debug.__class__.__name__), "debugging tools (valgrind, gprof)")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("verbose", "[%s, %s]" % ("1x1", obj.verbose.__class__.__name__), "verbosity level in solve")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("settings", "[%s, %s]" % ("1x1", obj.settings.__class__.__name__), "settings properties")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("toolkits", "[%s, %s]" % ("1x1", obj.toolkits.__class__.__name__), "PETSc options for each solution")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("cluster", "[%s, %s]" % ("1x1", obj.cluster.__class__.__name__), "cluster parameters (number of cpus...)")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("balancethickness", "[%s, %s]" % ("1x1", obj.balancethickness.__class__.__name__), "parameters for balancethickness solution")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("stressbalance", "[%s, %s]" % ("1x1", obj.stressbalance.__class__.__name__), "parameters for stressbalance solution")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("groundingline", "[%s, %s]" % ("1x1", obj.groundingline.__class__.__name__), "parameters for groundingline solution")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("hydrology", "[%s, %s]" % ("1x1", obj.hydrology.__class__.__name__), "parameters for hydrology solution")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("masstransport", "[%s, %s]" % ("1x1", obj.masstransport.__class__.__name__), "parameters for masstransport solution")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("thermal", "[%s, %s]" % ("1x1", obj.thermal.__class__.__name__), "parameters for thermal solution")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("steadystate", "[%s, %s]" % ("1x1", obj.steadystate.__class__.__name__), "parameters for steadystate solution")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("transient", "[%s, %s]" % ("1x1", obj.transient.__class__.__name__), "parameters for transient solution")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("levelset", "[%s, %s]" % ("1x1", obj.levelset.__class__.__name__), "parameters for moving boundaries (level - set method)")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("calving", "[%s, %s]" % ("1x1", obj.calving.__class__.__name__), "parameters for calving")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("frontalforcings", "[%s, %s]" % ("1x1", obj.frontalforcings.__class__.__name__), "parameters for frontalforcings")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("gia", "[%s, %s]" % ("1x1", obj.gia.__class__.__name__), "parameters for gia solution")) - string = "%s\n%s" % (string, '%19s: % - 22s - - %s' % ("love", "[%s, %s]" % ("1x1", obj.love.__class__.__name__), "parameters for love solution")) - string = "%s\n%s" % (string, '%19s: % - 22s - - %s' % ("esa", "[%s, %s]" % ("1x1", obj.esa.__class__.__name__), "parameters for elastic adjustment solution")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("autodiff", "[%s, %s]" % ("1x1", obj.autodiff.__class__.__name__), "automatic differentiation parameters")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("inversion", "[%s, %s]" % ("1x1", obj.inversion.__class__.__name__), "parameters for inverse methods")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("qmu", "[%s, %s]" % ("1x1", obj.qmu.__class__.__name__), "dakota properties")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("amr", "[%s, %s]" % ("1x1", obj.amr.__class__.__name__), "adaptive mesh refinement properties")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("outputdefinition", "[%s, %s]" % ("1x1", obj.outputdefinition.__class__.__name__), "output definition")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("results", "[%s, %s]" % ("1x1", obj.results.__class__.__name__), "model results")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("radaroverlay", "[%s, %s]" % ("1x1", obj.radaroverlay.__class__.__name__), "radar image for plot overlay")) - string = "%s\n%s" % (string, "%19s: % - 22s - - %s" % ("miscellaneous", "[%s, %s]" % ("1x1", obj.miscellaneous.__class__.__name__), "miscellaneous fields")) + string = "%19s: % - 22s -- %s" % ("mesh", "[%s, %s]" % ("1x1", obj.mesh.__class__.__name__), "mesh properties") + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("mask", "[%s, %s]" % ("1x1", obj.mask.__class__.__name__), "defines grounded and floating elements")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("geometry", "[%s, %s]" % ("1x1", obj.geometry.__class__.__name__), "surface elevation, bedrock topography, ice thickness, ...")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("constants", "[%s, %s]" % ("1x1", obj.constants.__class__.__name__), "physical constants")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("smb", "[%s, %s]" % ("1x1", obj.smb.__class__.__name__), "surface mass balance")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("basalforcings", "[%s, %s]" % ("1x1", obj.basalforcings.__class__.__name__), "bed forcings")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("materials", "[%s, %s]" % ("1x1", obj.materials.__class__.__name__), "material properties")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("damage", "[%s, %s]" % ("1x1", obj.damage.__class__.__name__), "damage propagation laws")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("friction", "[%s, %s]" % ("1x1", obj.friction.__class__.__name__), "basal friction / drag properties")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("flowequation", "[%s, %s]" % ("1x1", obj.flowequation.__class__.__name__), "flow equations")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("timestepping", "[%s, %s]" % ("1x1", obj.timestepping.__class__.__name__), "time stepping for transient models")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("initialization", "[%s, %s]" % ("1x1", obj.initialization.__class__.__name__), "initial guess / state")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("rifts", "[%s, %s]" % ("1x1", obj.rifts.__class__.__name__), "rifts properties")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("solidearth", "[%s, %s]" % ("1x1", obj.solidearth.__class__.__name__), "solid earth inputs and settings")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("dsl", "[%s, %s]" % ("1x1", obj.dsl.__class__.__name__), "dynamic sea level")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("debug", "[%s, %s]" % ("1x1", obj.debug.__class__.__name__), "debugging tools (valgrind, gprof)")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("verbose", "[%s, %s]" % ("1x1", obj.verbose.__class__.__name__), "verbosity level in solve")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("settings", "[%s, %s]" % ("1x1", obj.settings.__class__.__name__), "settings properties")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("toolkits", "[%s, %s]" % ("1x1", obj.toolkits.__class__.__name__), "PETSc options for each solution")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("cluster", "[%s, %s]" % ("1x1", obj.cluster.__class__.__name__), "cluster parameters (number of cpus...)")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("balancethickness", "[%s, %s]" % ("1x1", obj.balancethickness.__class__.__name__), "parameters for balancethickness solution")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("stressbalance", "[%s, %s]" % ("1x1", obj.stressbalance.__class__.__name__), "parameters for stressbalance solution")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("groundingline", "[%s, %s]" % ("1x1", obj.groundingline.__class__.__name__), "parameters for groundingline solution")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("hydrology", "[%s, %s]" % ("1x1", obj.hydrology.__class__.__name__), "parameters for hydrology solution")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("masstransport", "[%s, %s]" % ("1x1", obj.masstransport.__class__.__name__), "parameters for masstransport solution")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("thermal", "[%s, %s]" % ("1x1", obj.thermal.__class__.__name__), "parameters for thermal solution")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("steadystate", "[%s, %s]" % ("1x1", obj.steadystate.__class__.__name__), "parameters for steadystate solution")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("transient", "[%s, %s]" % ("1x1", obj.transient.__class__.__name__), "parameters for transient solution")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("levelset", "[%s, %s]" % ("1x1", obj.levelset.__class__.__name__), "parameters for moving boundaries (level - set method)")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("calving", "[%s, %s]" % ("1x1", obj.calving.__class__.__name__), "parameters for calving")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("frontalforcings", "[%s, %s]" % ("1x1", obj.frontalforcings.__class__.__name__), "parameters for frontalforcings")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("gia", "[%s, %s]" % ("1x1", obj.gia.__class__.__name__), "parameters for gia solution")) + string = "%s\n%s" % (string, '%19s: % - 22s -- %s' % ("love", "[%s, %s]" % ("1x1", obj.love.__class__.__name__), "parameters for love solution")) + string = "%s\n%s" % (string, '%19s: % - 22s -- %s' % ("esa", "[%s, %s]" % ("1x1", obj.esa.__class__.__name__), "parameters for elastic adjustment solution")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("autodiff", "[%s, %s]" % ("1x1", obj.autodiff.__class__.__name__), "automatic differentiation parameters")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("inversion", "[%s, %s]" % ("1x1", obj.inversion.__class__.__name__), "parameters for inverse methods")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("qmu", "[%s, %s]" % ("1x1", obj.qmu.__class__.__name__), "dakota properties")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("amr", "[%s, %s]" % ("1x1", obj.amr.__class__.__name__), "adaptive mesh refinement properties")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("outputdefinition", "[%s, %s]" % ("1x1", obj.outputdefinition.__class__.__name__), "output definition")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("results", "[%s, %s]" % ("1x1", obj.results.__class__.__name__), "model results")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("radaroverlay", "[%s, %s]" % ("1x1", obj.radaroverlay.__class__.__name__), "radar image for plot overlay")) + string = "%s\n%s" % (string, "%19s: % - 22s -- %s" % ("miscellaneous", "[%s, %s]" % ("1x1", obj.miscellaneous.__class__.__name__), "miscellaneous fields")) return string # }}} Index: /issm/trunk-jpl/src/m/classes/sealevelmodel.m =================================================================== --- /issm/trunk-jpl/src/m/classes/sealevelmodel.m (revision 25135) +++ /issm/trunk-jpl/src/m/classes/sealevelmodel.m (revision 25136) @@ -308,13 +308,13 @@ end % }}} function addicecap(self,md) % {{{ - if ~strcmpi(class(md),'model') - error('addicecap method only takes a ''model'' class object as input'); - end - self.icecaps{end+1}=md; + if ~strcmpi(class(md),'model') + error('addicecap method only takes a ''model'' class object as input'); + end + self.icecaps{end+1}=md; end % }}} function basinsplot3d(self,varargin) % {{{ - for i=1:length(self.basins), - self.basins{i}.plot3d(varargin{:}); - end + for i=1:length(self.basins), + self.basins{i}.plot3d(varargin{:}); + end end % }}} function caticecaps(self,varargin) % {{{ Index: /issm/trunk-jpl/src/m/miscellaneous/fielddisplay.py =================================================================== --- /issm/trunk-jpl/src/m/miscellaneous/fielddisplay.py (revision 25135) +++ /issm/trunk-jpl/src/m/miscellaneous/fielddisplay.py (revision 25136) @@ -121,5 +121,5 @@ #take care of characterization if m.strcmp(characterization, "''") or m.strcmp(characterization, '""') or m.strcmpi(characterization, 'nan'): - characterization = "N / A" + characterization = "N/A" if len(characterization) > 15: @@ -131,7 +131,7 @@ else: if isinstance(comment, str): - string = "%s% - 23s: % - 15s - - %s" % (offset, name, characterization, comment) + string = "%s% - 23s: % - 15s -- %s" % (offset, name, characterization, comment) elif isinstance(comment, list): - string = "%s% - 23s: % - 15s - - %s" % (offset, name, characterization, comment[0]) + string = "%s% - 23s: % - 15s -- %s" % (offset, name, characterization, comment[0]) for commenti in comment: string += "\n%s% - 23s % - 15s %s" % (offset, '', '', commenti)