Context Navigation

← Previous Changeset
Next Changeset →

Changeset 3589

Timestamp:

Apr 21, 2010, 9:27:55 AM (16 years ago)

Author:

Mathieu Morlighem

Message:

Readded initial Balancedthickness and moved DG to Balancedthickness2

Location:

issm/trunk/src/m

Files:

: 3 added
: 55 edited

classes/public/ismodelselfconsistent.m (modified) (1 diff)
classes/public/modelextract.m (modified) (1 diff)
classes/public/process_solve_options.m (modified) (1 diff)
classes/public/solve.m (modified) (1 diff)
enum/AirEnum.m (modified) (1 diff)
enum/AnalysisTypeFromEnum.m (modified) (1 diff)
enum/Balancedthickness2AnalysisEnum.m (added)
enum/BalancedvelocitiesAnalysisEnum.m (modified) (1 diff)
enum/BeamEnum.m (modified) (1 diff)
enum/DofIndexingEnum.m (modified) (1 diff)
enum/DofVecEnum.m (modified) (1 diff)
enum/ElementEnum.m (modified) (1 diff)
enum/ElementPropertiesEnum.m (modified) (1 diff)
enum/FormulationEnum.m (modified) (1 diff)
enum/GeographyEnum.m (modified) (1 diff)
enum/HookEnum.m (modified) (1 diff)
enum/HutterFormulationEnum.m (modified) (1 diff)
enum/IceEnum.m (modified) (1 diff)
enum/IceSheetEnum.m (modified) (1 diff)
enum/IceShelfEnum.m (modified) (1 diff)
enum/IcefrontEnum.m (modified) (1 diff)
enum/InputEnum.m (modified) (1 diff)
enum/LoadEnum.m (modified) (1 diff)
enum/MacAyealFormulationEnum.m (modified) (1 diff)
enum/MaterialEnum.m (modified) (1 diff)
enum/MaticeEnum.m (modified) (1 diff)
enum/MatparEnum.m (modified) (1 diff)
enum/MelangeEnum.m (modified) (1 diff)
enum/MeltingAnalysisEnum.m (modified) (1 diff)
enum/Mesh2gridAnalysisEnum.m (modified) (1 diff)
enum/NodeEnum.m (modified) (1 diff)
enum/NodePropertiesEnum.m (modified) (1 diff)
enum/NoneAnalysisEnum.m (modified) (1 diff)
enum/NoneFormulationEnum.m (modified) (1 diff)
enum/NumericalfluxEnum.m (modified) (1 diff)
enum/NumparEnum.m (modified) (1 diff)
enum/ObjectEnum.m (modified) (1 diff)
enum/ParamEnum.m (modified) (1 diff)
enum/ParametersAnalysisEnum.m (modified) (1 diff)
enum/PattynFormulationEnum.m (modified) (1 diff)
enum/PengridEnum.m (modified) (1 diff)
enum/PenpairEnum.m (modified) (1 diff)
enum/PentaEnum.m (modified) (1 diff)
enum/ResultEnum.m (modified) (1 diff)
enum/RgbEnum.m (modified) (1 diff)
enum/RiftfrontEnum.m (modified) (1 diff)
enum/SingEnum.m (modified) (1 diff)
enum/SpcEnum.m (modified) (1 diff)
enum/SteadystateAnalysisEnum.m (modified) (1 diff)
enum/StokesFormulationEnum.m (modified) (1 diff)
enum/TriaEnum.m (modified) (1 diff)
enum/VertexEnum.m (modified) (1 diff)
enum/WaterEnum.m (modified) (1 diff)
solutions/jpl/balancedthickness.m (modified) (2 diffs)
solutions/jpl/balancedthickness2.m (added)
solutions/jpl/balancedthickness2_core.m (added)
solutions/jpl/balancedthickness_core.m (modified) (2 diffs)
solutions/jpl/diagnostic_core_linear.m (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

issm/trunk/src/m/classes/public/ismodelselfconsistent.m

-              r3582
+              r3589
 %BALANCEDTHICKNESS
 if md.analysis_type==BalancedthicknessAnalysisEnum
+        %VELOCITIES MELTING AND ACCUMULATION
+        fields={'vx','vy','accumulation','melting'};
+        checksize(md,fields,[md.numberofgrids 1]);
+        checknan(md,fields);
+        %SPC
+        if any(md.spcthickness(find(md.gridonboundary))~=1),
+                error(['model not consistent: model ' md.name ' should have all the nodes on boundary constrained in field spcthickness']);
+        end
+end
+%BALANCEDTHICKNESS2
+if md.analysis_type==Balancedthickness2AnalysisEnum
         %VELOCITIES MELTING AND ACCUMULATION

issm/trunk/src/m/classes/public/modelextract.m

-              r3583
+              r3589
 %some checks
 if ((nargin~=2) | (nargout~=1)),
         help modelextract2
         error('modelextract2 error message: bad usage');
+        help modelextract
+        error('modelextract error message: bad usage');
 end

issm/trunk/src/m/classes/public/process_solve_options.m

r3354	r3589
21	21	%check solution type is supported
22	22	if ~ismemberi(analysis_type,{'diagnostic','prognostic','prognostic2','thermal','steadystate','parameters','transient',...
23		'balancedthickness','balancedvelocities','slopecompute'}),
	23	'balancedthickness','balancedthickness2','balancedvelocities','slopecompute'}),
24	24	error(['process_solve_options error message: analysis_type ' analysis_type ' not supported yet!']);
25	25	else

issm/trunk/src/m/classes/public/solve.m

-              r3354
+              r3589
         md=balancedthickness(md);
+elseif md.analysis_type==Balancedthickness2AnalysisEnum,
+        md=balancedthickness2(md);
 elseif md.analysis_type==BalancedvelocitiesAnalysisEnum,
         md=balancedvelocities(md);

issm/trunk/src/m/enum/AirEnum.m

r3567	r3589
7	7	% macro=AirEnum()
8	8
9		macro=75;
	9	macro=76;

issm/trunk/src/m/enum/AnalysisTypeFromEnum.m

-              r3567
+              r3589
 end
+if enum==Balancedthickness2AnalysisEnum(),
+        string='balancedthickness2';
+end
 if enum==BalancedvelocitiesAnalysisEnum(),
         string='balancedvelocities';

issm/trunk/src/m/enum/BalancedvelocitiesAnalysisEnum.m

r3567	r3589
7	7	% macro=BalancedvelocitiesAnalysisEnum()
8	8
9		macro=30;
	9	macro=31;

issm/trunk/src/m/enum/BeamEnum.m

r3567	r3589
7	7	% macro=BeamEnum()
8	8
9		macro=49;
	9	macro=50;

issm/trunk/src/m/enum/DofIndexingEnum.m

r3567	r3589
7	7	% macro=DofIndexingEnum()
8	8
9		macro=51;
	9	macro=52;

issm/trunk/src/m/enum/DofVecEnum.m

r3567	r3589
7	7	% macro=DofVecEnum()
8	8
9		macro=69;
	9	macro=70;

issm/trunk/src/m/enum/ElementEnum.m

r3567	r3589
7	7	% macro=ElementEnum()
8	8
9		macro=44;
	9	macro=45;

issm/trunk/src/m/enum/ElementPropertiesEnum.m

r3567	r3589
7	7	% macro=ElementPropertiesEnum()
8	8
9		macro=46;
	9	macro=47;

issm/trunk/src/m/enum/FormulationEnum.m

r3567	r3589
7	7	% macro=FormulationEnum()
8	8
9		macro=36;
	9	macro=37;

issm/trunk/src/m/enum/GeographyEnum.m

r3567	r3589
7	7	% macro=GeographyEnum()
8	8
9		macro=70;
	9	macro=71;

issm/trunk/src/m/enum/HookEnum.m

r3567	r3589
7	7	% macro=HookEnum()
8	8
9		macro=43;
	9	macro=44;

issm/trunk/src/m/enum/HutterFormulationEnum.m

r3567	r3589
7	7	% macro=HutterFormulationEnum()
8	8
9		macro=38;
	9	macro=39;

issm/trunk/src/m/enum/IceEnum.m

r3567	r3589
7	7	% macro=IceEnum()
8	8
9		macro=74;
	9	macro=75;

issm/trunk/src/m/enum/IceSheetEnum.m

r3567	r3589
7	7	% macro=IceSheetEnum()
8	8
9		macro=71;
	9	macro=72;

issm/trunk/src/m/enum/IceShelfEnum.m

r3567	r3589
7	7	% macro=IceShelfEnum()
8	8
9		macro=72;
	9	macro=73;

issm/trunk/src/m/enum/IcefrontEnum.m

r3567	r3589
7	7	% macro=IcefrontEnum()
8	8
9		macro=55;
	9	macro=56;

issm/trunk/src/m/enum/InputEnum.m

r3567	r3589
7	7	% macro=InputEnum()
8	8
9		macro=64;
	9	macro=65;

issm/trunk/src/m/enum/LoadEnum.m

r3567	r3589
7	7	% macro=LoadEnum()
8	8
9		macro=54;
	9	macro=55;

issm/trunk/src/m/enum/MacAyealFormulationEnum.m

r3567	r3589
7	7	% macro=MacAyealFormulationEnum()
8	8
9		macro=39;
	9	macro=40;

issm/trunk/src/m/enum/MaterialEnum.m

r3567	r3589
7	7	% macro=MaterialEnum()
8	8
9		macro=60;
	9	macro=61;

issm/trunk/src/m/enum/MaticeEnum.m

r3567	r3589
7	7	% macro=MaticeEnum()
8	8
9		macro=61;
	9	macro=62;

issm/trunk/src/m/enum/MatparEnum.m

r3567	r3589
7	7	% macro=MatparEnum()
8	8
9		macro=62;
	9	macro=63;

issm/trunk/src/m/enum/MelangeEnum.m

r3567	r3589
7	7	% macro=MelangeEnum()
8	8
9		macro=76;
	9	macro=77;

issm/trunk/src/m/enum/MeltingAnalysisEnum.m

r3567	r3589
7	7	% macro=MeltingAnalysisEnum()
8	8
9		macro=31;
	9	macro=32;

issm/trunk/src/m/enum/Mesh2gridAnalysisEnum.m

r3567	r3589
7	7	% macro=Mesh2gridAnalysisEnum()
8	8
9		macro=32;
	9	macro=33;

issm/trunk/src/m/enum/NodeEnum.m

r3567	r3589
7	7	% macro=NodeEnum()
8	8
9		macro=52;
	9	macro=53;

issm/trunk/src/m/enum/NodePropertiesEnum.m

r3567	r3589
7	7	% macro=NodePropertiesEnum()
8	8
9		macro=47;
	9	macro=48;

issm/trunk/src/m/enum/NoneAnalysisEnum.m

r3567	r3589
7	7	% macro=NoneAnalysisEnum()
8	8
9		macro=35;
	9	macro=36;

issm/trunk/src/m/enum/NoneFormulationEnum.m

r3567	r3589
7	7	% macro=NoneFormulationEnum()
8	8
9		macro=37;
	9	macro=38;

issm/trunk/src/m/enum/NumericalfluxEnum.m

r3567	r3589
7	7	% macro=NumericalfluxEnum()
8	8
9		macro=59;
	9	macro=60;

issm/trunk/src/m/enum/NumparEnum.m

r3567	r3589
7	7	% macro=NumparEnum()
8	8
9		macro=63;
	9	macro=64;

issm/trunk/src/m/enum/ObjectEnum.m

r3567	r3589
7	7	% macro=ObjectEnum()
8	8
9		macro=42;
	9	macro=43;

issm/trunk/src/m/enum/ParamEnum.m

r3567	r3589
7	7	% macro=ParamEnum()
8	8
9		macro=65;
	9	macro=66;

issm/trunk/src/m/enum/ParametersAnalysisEnum.m

r3567	r3589
7	7	% macro=ParametersAnalysisEnum()
8	8
9		macro=33;
	9	macro=34;

issm/trunk/src/m/enum/PattynFormulationEnum.m

r3567	r3589
7	7	% macro=PattynFormulationEnum()
8	8
9		macro=40;
	9	macro=41;

issm/trunk/src/m/enum/PengridEnum.m

r3567	r3589
7	7	% macro=PengridEnum()
8	8
9		macro=58;
	9	macro=59;

issm/trunk/src/m/enum/PenpairEnum.m

r3567	r3589
7	7	% macro=PenpairEnum()
8	8
9		macro=57;
	9	macro=58;

issm/trunk/src/m/enum/PentaEnum.m

r3567	r3589
7	7	% macro=PentaEnum()
8	8
9		macro=48;
	9	macro=49;

issm/trunk/src/m/enum/ResultEnum.m

r3567	r3589
7	7	% macro=ResultEnum()
8	8
9		macro=66;
	9	macro=67;

issm/trunk/src/m/enum/RgbEnum.m

r3567	r3589
7	7	% macro=RgbEnum()
8	8
9		macro=67;
	9	macro=68;

issm/trunk/src/m/enum/RiftfrontEnum.m

r3567	r3589
7	7	% macro=RiftfrontEnum()
8	8
9		macro=56;
	9	macro=57;

issm/trunk/src/m/enum/SingEnum.m

r3567	r3589
7	7	% macro=SingEnum()
8	8
9		macro=50;
	9	macro=51;

issm/trunk/src/m/enum/SpcEnum.m

r3567	r3589
7	7	% macro=SpcEnum()
8	8
9		macro=68;
	9	macro=69;

issm/trunk/src/m/enum/SteadystateAnalysisEnum.m

r3567	r3589
7	7	% macro=SteadystateAnalysisEnum()
8	8
9		macro=34;
	9	macro=35;

issm/trunk/src/m/enum/StokesFormulationEnum.m

r3567	r3589
7	7	% macro=StokesFormulationEnum()
8	8
9		macro=41;
	9	macro=42;

issm/trunk/src/m/enum/TriaEnum.m

r3567	r3589
7	7	% macro=TriaEnum()
8	8
9		macro=45;
	9	macro=46;

issm/trunk/src/m/enum/VertexEnum.m

r3567	r3589
7	7	% macro=VertexEnum()
8	8
9		macro=53;
	9	macro=54;

issm/trunk/src/m/enum/WaterEnum.m

r3567	r3589
7	7	% macro=WaterEnum()
8	8
9		macro=73;
	9	macro=74;

issm/trunk/src/m/solutions/jpl/balancedthickness.m

-              r3582
+              r3589
         displaystring(md.verbose,'%s',['reading balancedthickness model data']);
         md.analysis_type=BalancedthicknessAnalysisEnum; models.p=CreateFemModel(md);
+        md.analysis_type=BalancedthicknessAnalysisEnum; models.bt=CreateFemModel(md);
         % figure out number of dof: just for information purposes.
 …
         displaystring(md.verbose,'\n%s',['setup inputs...']);
         inputs=inputlist;
+        inputs=add(inputs,'vx',models.p.parameters.vx_g,'doublevec',1,models.p.parameters.numberofvertices);
+        inputs=add(inputs,'vy',models.p.parameters.vy_g,'doublevec',1,models.p.parameters.numberofvertices);
+        inputs=add(inputs,'thickness',models.p.parameters.h_g,'doublevec',1,models.p.parameters.numberofvertices);
+        inputs=add(inputs,'dhdt',models.p.parameters.dhdt_g,'doublevec',1,models.p.parameters.numberofvertices);
+        inputs=add(inputs,'melting',models.p.parameters.m_g,'doublevec',1,models.p.parameters.numberofvertices);
+        inputs=add(inputs,'accumulation',models.p.parameters.a_g,'doublevec',1,models.p.parameters.numberofvertices);
+        inputs=add(inputs,'velocity',models.bt.parameters.u_g,'doublevec',3,models.bt.parameters.numberofnodes);
+        inputs=add(inputs,'melting',models.bt.parameters.m_g,'doublevec',1,models.bt.parameters.numberofnodes);
+        inputs=add(inputs,'accumulation',models.bt.parameters.a_g,'doublevec',1,models.bt.parameters.numberofnodes);
         displaystring(md.verbose,'\n%s',['call computational core:']);

issm/trunk/src/m/solutions/jpl/balancedthickness_core.m

-              r3582
+              r3589
         %get FE model
         m=models.p;
+        m=models.bt;
         results.time=0;
         results.step=1;
 …
         displaystring(m.parameters.verbose,'\n%s',['depth averaging velocity...']);
         %Take only the first two dofs of m.parameters.u_g
+        vx_g=get(inputs,'vx',1);
+        vy_g=get(inputs,'vy',1);
+        %NOT WORKING YET!!!!!
+        %vx_g=FieldDepthAverage(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,vx_g,'vx');
+        %vy_g=FieldDepthAverage(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,vy_g,'vy');
+        inputs=add(inputs,'vx_average',vx_g,'doublevec',1,m.parameters.numberofvertices);
+        inputs=add(inputs,'vy_average',vy_g,'doublevec',1,m.parameters.numberofvertices);
+        u_g=get(inputs,'velocity',[1 1 0 0]);
+        u_g=FieldDepthAverage(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,u_g,'velocity');
+        inputs=add(inputs,'velocity_average',u_g,'doublevec',2,m.parameters.numberofnodes);
         displaystring(m.parameters.verbose,'\n%s',['call computational core:']);
         results.h_g=diagnostic_core_linear(m,inputs,analysis_type,sub_analysis_type);
-        displaystring(m.parameters.verbose,'\n%s',['averaging over vertices']);
-        results.h_g=FieldAverageOntoVertices(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,results.h_g);
         displaystring(m.parameters.verbose,'\n%s',['extrude computed thickness on all layers:']);
         %results.h_g=FieldAverageOntoVertices(m.elements,m.nodes,m.loads,m.materials,m.parameters,results.h_g,'thickness');
+        results.h_g=FieldExtrude(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,results.h_g,'thickness',0);
 end %end function

issm/trunk/src/m/solutions/jpl/diagnostic_core_linear.m

r3582	r3589
13	13	%system matrices
14	14	[K_gg, p_g]=SystemMatrices(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
15		~~save A K_gg p_g~~
16	15	[K_gg, p_g,kmax]=PenaltySystemMatrices(K_gg,p_g,m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
17	16

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 3589

Legend:

Download in other formats: