![(please configure the [header_logo] section in trac.ini)](/trac/issm/chrome/common/trac_banner.png)
Changeset 13040
- Timestamp:
- 08/15/12 07:04:15 (13 years ago)
- Location:
- issm/trunk-jpl/src/m/classes
- Files:
-
- 17 edited
-
diagnostic.m (modified) (1 diff)
-
diagnostic.py (modified) (1 diff)
-
flowequation.m (modified) (1 diff)
-
flowequation.py (modified) (1 diff)
-
inversion.m (modified) (1 diff)
-
inversion.py (modified) (1 diff)
-
rifts.py (modified) (3 diffs)
-
settings.m (modified) (1 diff)
-
settings.py (modified) (1 diff)
-
surfaceforcings.m (modified) (1 diff)
-
surfaceforcings.py (modified) (1 diff)
-
thermal.m (modified) (1 diff)
-
thermal.py (modified) (1 diff)
-
timestepping.m (modified) (1 diff)
-
timestepping.py (modified) (1 diff)
-
transient.m (modified) (1 diff)
-
transient.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified issm/trunk-jpl/src/m/classes/diagnostic.m ¶
r13020 r13040 76 76 md = checkfield(md,'diagnostic.reltol','size',[1 1]); 77 77 md = checkfield(md,'diagnostic.abstol','size',[1 1]); 78 md = checkfield(md,'diagnostic.isnewton','numel', 1,'values',[0 1]);78 md = checkfield(md,'diagnostic.isnewton','numel',[1],'values',[0 1]); 79 79 md = checkfield(md,'diagnostic.stokesreconditioning','size',[1 1],'NaN',1); 80 80 md = checkfield(md,'diagnostic.viscosity_overshoot','size',[1 1],'NaN',1); -
TabularUnified issm/trunk-jpl/src/m/classes/diagnostic.py ¶
r13032 r13040 125 125 md = checkfield(md,'diagnostic.reltol','size',[1]) 126 126 md = checkfield(md,'diagnostic.abstol','size',[1]) 127 md = checkfield(md,'diagnostic.isnewton','numel', 1,'values',[0,1])127 md = checkfield(md,'diagnostic.isnewton','numel',[1],'values',[0,1]) 128 128 md = checkfield(md,'diagnostic.stokesreconditioning','size',[1,1],'NaN',1) 129 129 md = checkfield(md,'diagnostic.viscosity_overshoot','size',[1,1],'NaN',1) -
TabularUnified issm/trunk-jpl/src/m/classes/flowequation.m ¶
r13020 r13040 31 31 if ismember(DiagnosticHorizAnalysisEnum(),analyses), 32 32 33 md = checkfield(md,'flowequation.ismacayealpattyn','numel', 1,'values',[0 1]);34 md = checkfield(md,'flowequation.ishutter','numel', 1,'values',[0 1]);35 md = checkfield(md,'flowequation.isstokes','numel', 1,'values',[0 1]);33 md = checkfield(md,'flowequation.ismacayealpattyn','numel',[1],'values',[0 1]); 34 md = checkfield(md,'flowequation.ishutter','numel',[1],'values',[0 1]); 35 md = checkfield(md,'flowequation.isstokes','numel',[1],'values',[0 1]); 36 36 md = checkfield(md,'flowequation.bordermacayeal','size',[md.mesh.numberofvertices 1],'values',[0 1]); 37 37 md = checkfield(md,'flowequation.borderpattyn','size',[md.mesh.numberofvertices 1],'values',[0 1]); -
TabularUnified issm/trunk-jpl/src/m/classes/flowequation.py ¶
r13032 r13040 54 54 55 55 if DiagnosticHorizAnalysisEnum() in analyses: 56 md = checkfield(md,'flowequation.ismacayealpattyn','numel', 1,'values',[0,1])57 md = checkfield(md,'flowequation.ishutter','numel', 1,'values',[0,1])58 md = checkfield(md,'flowequation.isstokes','numel', 1,'values',[0,1])56 md = checkfield(md,'flowequation.ismacayealpattyn','numel',[1],'values',[0,1]) 57 md = checkfield(md,'flowequation.ishutter','numel',[1],'values',[0,1]) 58 md = checkfield(md,'flowequation.isstokes','numel',[1],'values',[0,1]) 59 59 md = checkfield(md,'flowequation.bordermacayeal','size',[md.mesh.numberofvertices],'values',[0,1]) 60 60 md = checkfield(md,'flowequation.borderpattyn','size',[md.mesh.numberofvertices],'values',[0,1]) -
TabularUnified issm/trunk-jpl/src/m/classes/inversion.m ¶
r13025 r13040 87 87 md = checkfield(md,'inversion.incomplete_adjoint','values',[0 1]); 88 88 md = checkfield(md,'inversion.control_parameters','cell',1,'values',{'BalancethicknessThickeningRate' 'FrictionCoefficient' 'MaterialsRheologyBbar' 'Vx' 'Vy'}); 89 md = checkfield(md,'inversion.nsteps','numel', 1,'>=',1);89 md = checkfield(md,'inversion.nsteps','numel',[1],'>=',1); 90 90 md = checkfield(md,'inversion.maxiter_per_step','size',[md.inversion.nsteps 1],'>=',0); 91 91 md = checkfield(md,'inversion.step_threshold','size',[md.inversion.nsteps 1]); -
TabularUnified issm/trunk-jpl/src/m/classes/inversion.py ¶
r13030 r13040 125 125 md = checkfield(md,'inversion.incomplete_adjoint','values',[0,1]) 126 126 md = checkfield(md,'inversion.control_parameters','cell',1,'values',['BalancethicknessThickeningRate','FrictionCoefficient','MaterialsRheologyBbar','Vx','Vy']) 127 md = checkfield(md,'inversion.nsteps','numel', 1,'>=',1)127 md = checkfield(md,'inversion.nsteps','numel',[1],'>=',1) 128 128 md = checkfield(md,'inversion.maxiter_per_step','size',[md.inversion.nsteps],'>=',0) 129 129 md = checkfield(md,'inversion.step_threshold','size',[md.inversion.nsteps]) -
TabularUnified issm/trunk-jpl/src/m/classes/rifts.py ¶
r13020 r13040 40 40 41 41 def checkconsistency(self,md,solution,analyses): # {{{ 42 if (not self.riftstruct) or any(isnans(self.riftstruct)):42 if (not self.riftstruct) or numpy.any(isnans(self.riftstruct)): 43 43 numrifts=0 44 44 else: … … 50 50 if not isinstance(self.riftstruct,list): 51 51 md.checkmessage("rifts.riftstruct should be a structure!") 52 if any(md.mesh.segmentmarkers>=2):52 if numpy.any(md.mesh.segmentmarkers>=2): 53 53 #We have segments with rift markers, but no rift structure! 54 54 md.checkmessage("model should be processed for rifts (run meshprocessrifts)!") 55 55 md = checkfield(md,'rifts.riftstruct.fill','values',[WaterEnum(),AirEnum(),IceEnum(),MelangeEnum()]) 56 56 else: 57 if any(numpy.logical_not(isnans(self.riftstruct))):57 if numpy.any(numpy.logical_not(isnans(self.riftstruct))): 58 58 md.checkmessage("riftstruct shoud be NaN since numrifts is 0!") 59 59 … … 64 64 65 65 #Process rift info 66 if (not self.riftstruct) or any(isnans(self.riftstruct)):66 if (not self.riftstruct) or numpy.any(isnans(self.riftstruct)): 67 67 numrifts=0 68 68 else: -
TabularUnified issm/trunk-jpl/src/m/classes/settings.m ¶
r12663 r13040 43 43 function md = checkconsistency(obj,md,solution,analyses) % {{{ 44 44 45 md = checkfield(md,'settings.io_gather','numel', 1,'values',[0 1]);46 md = checkfield(md,'settings.lowmem','numel', 1,'values',[0 1]);47 md = checkfield(md,'settings.results_as_patches','numel', 1,'values',[0 1]);48 md = checkfield(md,'settings.output_frequency','numel', 1,'>=',1);49 md = checkfield(md,'settings.waitonlock','numel', 1);45 md = checkfield(md,'settings.io_gather','numel',[1],'values',[0 1]); 46 md = checkfield(md,'settings.lowmem','numel',[1],'values',[0 1]); 47 md = checkfield(md,'settings.results_as_patches','numel',[1],'values',[0 1]); 48 md = checkfield(md,'settings.output_frequency','numel',[1],'>=',1); 49 md = checkfield(md,'settings.waitonlock','numel',[1]); 50 50 51 51 end % }}} -
TabularUnified issm/trunk-jpl/src/m/classes/settings.py ¶
r12958 r13040 63 63 64 64 def checkconsistency(self,md,solution,analyses): # {{{ 65 md = checkfield(md,'settings.io_gather','numel', 1,'values',[0,1])66 md = checkfield(md,'settings.lowmem','numel', 1,'values',[0,1])67 md = checkfield(md,'settings.results_as_patches','numel', 1,'values',[0,1])68 md = checkfield(md,'settings.output_frequency','numel', 1,'>=',1)69 md = checkfield(md,'settings.waitonlock','numel', 1)65 md = checkfield(md,'settings.io_gather','numel',[1],'values',[0,1]) 66 md = checkfield(md,'settings.lowmem','numel',[1],'values',[0,1]) 67 md = checkfield(md,'settings.results_as_patches','numel',[1],'values',[0,1]) 68 md = checkfield(md,'settings.output_frequency','numel',[1],'>=',1) 69 md = checkfield(md,'settings.waitonlock','numel',[1]) 70 70 71 71 return md -
TabularUnified issm/trunk-jpl/src/m/classes/surfaceforcings.m ¶
r13020 r13040 45 45 46 46 if ismember(PrognosticAnalysisEnum(),analyses), 47 md = checkfield(md,'surfaceforcings.ispdd','numel', 1,'values',[0 1]);48 md = checkfield(md,'surfaceforcings.issmbgradients','numel', 1,'values',[0 1]);47 md = checkfield(md,'surfaceforcings.ispdd','numel',[1],'values',[0 1]); 48 md = checkfield(md,'surfaceforcings.issmbgradients','numel',[1],'values',[0 1]); 49 49 if(obj.ispdd) 50 50 if(obj.isdelta18o==0) -
TabularUnified issm/trunk-jpl/src/m/classes/surfaceforcings.py ¶
r13020 r13040 80 80 81 81 if PrognosticAnalysisEnum() in analyses: 82 md = checkfield(md,'surfaceforcings.ispdd','numel', 1,'values',[0,1])83 md = checkfield(md,'surfaceforcings.issmbgradients','numel', 1,'values',[0,1])82 md = checkfield(md,'surfaceforcings.ispdd','numel',[1],'values',[0,1]) 83 md = checkfield(md,'surfaceforcings.issmbgradients','numel',[1],'values',[0,1]) 84 84 if self.ispdd: 85 85 if not self.isdelta18o: -
TabularUnified issm/trunk-jpl/src/m/classes/thermal.m ¶
r13023 r13040 45 45 if (~ismember(ThermalAnalysisEnum(),analyses) & ~ismember(EnthalpyAnalysisEnum(),analyses)) | (solution==TransientSolutionEnum() & md.transient.isthermal==0), return; end 46 46 47 md = checkfield(md,'thermal.stabilization','numel', 1,'values',[0 1 2]);47 md = checkfield(md,'thermal.stabilization','numel',[1],'values',[0 1 2]); 48 48 md = checkfield(md,'thermal.spctemperature','forcing',1); 49 49 if (ismember(EnthalpyAnalysisEnum(),analyses) & md.thermal.isenthalpy & md.mesh.dimension==3), 50 50 md = checkfield(md,'thermal.spctemperature','<',md.materials.meltingpoint-md.materials.beta*md.materials.rho_ice*md.constants.g*(md.geometry.surface-md.mesh.z),'message','spctemperature should be below the adjusted melting point'); 51 md = checkfield(md,'thermal.isenthalpy','numel', 1,'values',[0 1]);51 md = checkfield(md,'thermal.isenthalpy','numel',[1],'values',[0 1]); 52 52 end 53 53 end % }}} -
TabularUnified issm/trunk-jpl/src/m/classes/thermal.py ¶
r13023 r13040 67 67 return md 68 68 69 md = checkfield(md,'thermal.stabilization','numel', 1,'values',[0,1,2])69 md = checkfield(md,'thermal.stabilization','numel',[1],'values',[0,1,2]) 70 70 md = checkfield(md,'thermal.spctemperature','forcing',1) 71 71 if EnthalpyAnalysisEnum() in analyses and md.thermal.isenthalpy and md.mesh.dimension==3: 72 72 md = checkfield(md,'thermal.spctemperature','<',md.materials.meltingpoint-md.materials.beta*md.materials.rho_ice*md.constants.g*(md.geometry.surface-md.mesh.z),'message',"spctemperature should be below the adjusted melting point") 73 md = checkfield(md,'thermal.isenthalpy','numel', 1,'values',[0,1])73 md = checkfield(md,'thermal.isenthalpy','numel',[1],'values',[0,1]) 74 74 75 75 return md -
TabularUnified issm/trunk-jpl/src/m/classes/timestepping.m ¶
r12663 r13040 35 35 function md = checkconsistency(obj,md,solution,analyses) % {{{ 36 36 37 md = checkfield(md,'timestepping.start_time','numel', 1,'NaN',1);38 md = checkfield(md,'timestepping.final_time','numel', 1,'NaN',1);39 md = checkfield(md,'timestepping.time_step','numel', 1,'>=',0,'NaN',1);40 md = checkfield(md,'timestepping.time_adapt','numel', 1,'values',[0 1]);41 md = checkfield(md,'timestepping.cfl_coefficient','numel', 1,'>',0,'<=',1);37 md = checkfield(md,'timestepping.start_time','numel',[1],'NaN',1); 38 md = checkfield(md,'timestepping.final_time','numel',[1],'NaN',1); 39 md = checkfield(md,'timestepping.time_step','numel',[1],'>=',0,'NaN',1); 40 md = checkfield(md,'timestepping.time_adapt','numel',[1],'values',[0 1]); 41 md = checkfield(md,'timestepping.cfl_coefficient','numel',[1],'>',0,'<=',1); 42 42 if obj.final_time-obj.start_time<0, 43 43 md = checkmessage(md,'timestepping.final_time should be larger than timestepping.start_time'); -
TabularUnified issm/trunk-jpl/src/m/classes/timestepping.py ¶
r12958 r13040 55 55 def checkconsistency(self,md,solution,analyses): # {{{ 56 56 57 md = checkfield(md,'timestepping.start_time','numel', 1,'NaN',1)58 md = checkfield(md,'timestepping.final_time','numel', 1,'NaN',1)59 md = checkfield(md,'timestepping.time_step','numel', 1,'>=',0,'NaN',1)60 md = checkfield(md,'timestepping.time_adapt','numel', 1,'values',[0,1])61 md = checkfield(md,'timestepping.cfl_coefficient','numel', 1,'>',0,'<=',1)57 md = checkfield(md,'timestepping.start_time','numel',[1],'NaN',1) 58 md = checkfield(md,'timestepping.final_time','numel',[1],'NaN',1) 59 md = checkfield(md,'timestepping.time_step','numel',[1],'>=',0,'NaN',1) 60 md = checkfield(md,'timestepping.time_adapt','numel',[1],'values',[0,1]) 61 md = checkfield(md,'timestepping.cfl_coefficient','numel',[1],'>',0,'<=',1) 62 62 if self.final_time-self.start_time<0: 63 63 md.checkmessage("timestepping.final_time should be larger than timestepping.start_time") -
TabularUnified issm/trunk-jpl/src/m/classes/transient.m ¶
r13020 r13040 35 35 if solution~=TransientSolutionEnum(), return; end 36 36 37 md = checkfield(md,'transient.isprognostic','numel', 1,'values',[0 1]);38 md = checkfield(md,'transient.isdiagnostic','numel', 1,'values',[0 1]);39 md = checkfield(md,'transient.isthermal','numel', 1,'values',[0 1]);40 md = checkfield(md,'transient.isgroundingline','numel', 1,'values',[0 1]);37 md = checkfield(md,'transient.isprognostic','numel',[1],'values',[0 1]); 38 md = checkfield(md,'transient.isdiagnostic','numel',[1],'values',[0 1]); 39 md = checkfield(md,'transient.isthermal','numel',[1],'values',[0 1]); 40 md = checkfield(md,'transient.isgroundingline','numel',[1],'values',[0 1]); 41 41 md = checkfield(md,'transient.requested_outputs','size',[NaN 1]); 42 42 -
TabularUnified issm/trunk-jpl/src/m/classes/transient.py ¶
r13023 r13040 55 55 return md 56 56 57 md = checkfield(md,'transient.isprognostic','numel', 1,'values',[0,1])58 md = checkfield(md,'transient.isdiagnostic','numel', 1,'values',[0,1])59 md = checkfield(md,'transient.isthermal','numel', 1,'values',[0,1])60 md = checkfield(md,'transient.isgroundingline','numel', 1,'values',[0,1])57 md = checkfield(md,'transient.isprognostic','numel',[1],'values',[0,1]) 58 md = checkfield(md,'transient.isdiagnostic','numel',[1],'values',[0,1]) 59 md = checkfield(md,'transient.isthermal','numel',[1],'values',[0,1]) 60 md = checkfield(md,'transient.isgroundingline','numel',[1],'values',[0,1]) 61 61 md = checkfield(md,'transient.requested_outputs','size',[float('NaN')]) 62 62
Note:
See TracChangeset
for help on using the changeset viewer.
