source: issm/oecreview/Archive/18296-19100/ISSM-18823-18824.diff@ 19102

Last change on this file since 19102 was 19102, checked in by Mathieu Morlighem, 10 years ago

NEW: added 18296-19100
File size: 7.6 KB
RevLine 
[19102]1Index: ../trunk-jpl/src/m/classes/m1qn3inversion.m
2===================================================================
3--- ../trunk-jpl/src/m/classes/m1qn3inversion.m (revision 18823)
4+++ ../trunk-jpl/src/m/classes/m1qn3inversion.m (revision 18824)
5@@ -68,7 +68,6 @@
6 if ~IssmConfig('_HAVE_M1QN3_'),
7 md = checkmessage(md,['M1QN3 has not been installed, ISSM needs to be reconfigured and recompiled with M1QN3']);
8 end
9-
10 num_controls=numel(md.inversion.control_parameters);
11 num_costfunc=size(md.inversion.cost_functions,2);
12
13@@ -76,13 +75,13 @@
14 md = checkfield(md,'fieldname','inversion.incomplete_adjoint','values',[0 1]);
15 md = checkfield(md,'fieldname','inversion.control_parameters','cell',1,'values',...
16 {'BalancethicknessThickeningRate' 'FrictionCoefficient' 'MaterialsRheologyBbar' 'DamageDbar',...
17- 'Vx' 'Vy' 'Thickness' 'BalancethicknessOmega' 'BalancethicknessApparentMassbalance'});
18+ 'Vx' 'Vy' 'Thickness' 'BalancethicknessOmega' 'BalancethicknessApparentMassbalance','MaterialsRheologyB'});
19 md = checkfield(md,'fieldname','inversion.control_scaling_factors','size',[1 num_controls],'>',0,'NaN',1);
20 md = checkfield(md,'fieldname','inversion.maxsteps','numel',1,'>=',0);
21 md = checkfield(md,'fieldname','inversion.maxiter','numel',1,'>=',0);
22 md = checkfield(md,'fieldname','inversion.dxmin','numel',1,'>',0);
23 md = checkfield(md,'fieldname','inversion.gttol','numel',1,'>',0);
24- md = checkfield(md,'fieldname','inversion.cost_functions','size',[1 num_costfunc],'values',[101:105 201 501:506 601:604]);
25+ md = checkfield(md,'fieldname','inversion.cost_functions','size',[1 num_costfunc],'values',[101:105 201 501:507 601:604]);
26 md = checkfield(md,'fieldname','inversion.cost_functions_coefficients','size',[md.mesh.numberofvertices num_costfunc],'>=',0);
27 md = checkfield(md,'fieldname','inversion.min_parameters','size',[md.mesh.numberofvertices num_controls]);
28 md = checkfield(md,'fieldname','inversion.max_parameters','size',[md.mesh.numberofvertices num_controls]);
29@@ -180,6 +179,7 @@
30 pos=find(obj.cost_functions==504); data(pos)=ThicknessAlongGradientEnum();
31 pos=find(obj.cost_functions==505); data(pos)=ThicknessAcrossGradientEnum();
32 pos=find(obj.cost_functions==506); data(pos)=BalancethicknessMisfitEnum();
33+ pos=find(obj.cost_functions==507); data(pos)=RheologyBAbsGradientEnum();
34 pos=find(obj.cost_functions==601); data(pos)=SurfaceAbsMisfitEnum();
35 WriteData(fid,'data',data,'enum',InversionCostFunctionsEnum(),'format','DoubleMat','mattype',3);
36 WriteData(fid,'data',num_cost_functions,'enum',InversionNumCostFunctionsEnum(),'format','Integer');
37Index: ../trunk-jpl/src/m/classes/inversionvalidation.m
38===================================================================
39--- ../trunk-jpl/src/m/classes/inversionvalidation.m (revision 18823)
40+++ ../trunk-jpl/src/m/classes/inversionvalidation.m (revision 18824)
41@@ -58,9 +58,9 @@
42 md = checkfield(md,'fieldname','inversion.incomplete_adjoint','values',[0 1]);
43 md = checkfield(md,'fieldname','inversion.control_parameters','cell',1,'values',...
44 {'BalancethicknessThickeningRate' 'FrictionCoefficient' 'MaterialsRheologyBbar' 'DamageDbar' 'Vx' 'Vy' 'Thickness',...
45- 'BalancethicknessOmega' 'BalancethicknessApparentMassbalance'});
46+ 'BalancethicknessOmega' 'BalancethicknessApparentMassbalance','MaterialsRheologyB'});
47 md = checkfield(md,'fieldname','inversion.control_scaling_factors','size',[1 num_controls],'>',0,'NaN',1);
48- md = checkfield(md,'fieldname','inversion.cost_functions','size',[1 num_costfunc],'values',[101:105 201 501:506 601:604]);
49+ md = checkfield(md,'fieldname','inversion.cost_functions','size',[1 num_costfunc],'values',[101:105 201 501:507 601:604]);
50 md = checkfield(md,'fieldname','inversion.cost_functions_coefficients','size',[md.mesh.numberofvertices num_costfunc],'>=',0);
51 md = checkfield(md,'fieldname','inversion.min_parameters','size',[md.mesh.numberofvertices num_controls]);
52 md = checkfield(md,'fieldname','inversion.max_parameters','size',[md.mesh.numberofvertices num_controls]);
53@@ -149,6 +149,7 @@
54 pos=find(obj.cost_functions==504); data(pos)=ThicknessAlongGradientEnum();
55 pos=find(obj.cost_functions==505); data(pos)=ThicknessAcrossGradientEnum();
56 pos=find(obj.cost_functions==506); data(pos)=BalancethicknessMisfitEnum();
57+ pos=find(obj.cost_functions==507); data(pos)=RheologyBAbsGradientEnum();
58 pos=find(obj.cost_functions==601); data(pos)=SurfaceAbsMisfitEnum();
59 WriteData(fid,'data',data,'enum',InversionCostFunctionsEnum(),'format','DoubleMat','mattype',3);
60 WriteData(fid,'data',num_cost_functions,'enum',InversionNumCostFunctionsEnum(),'format','Integer');
61Index: ../trunk-jpl/src/m/classes/inversion.m
62===================================================================
63--- ../trunk-jpl/src/m/classes/inversion.m (revision 18823)
64+++ ../trunk-jpl/src/m/classes/inversion.m (revision 18824)
65@@ -133,11 +133,11 @@
66 md = checkfield(md,'fieldname','inversion.incomplete_adjoint','values',[0 1]);
67 md = checkfield(md,'fieldname','inversion.control_parameters','cell',1,'values',...
68 {'BalancethicknessThickeningRate' 'FrictionCoefficient' 'MaterialsRheologyBbar' 'DamageDbar' 'Vx' 'Vy' 'Thickness',...
69- 'BalancethicknessOmega' 'BalancethicknessApparentMassbalance'});
70+ 'BalancethicknessOmega' 'BalancethicknessApparentMassbalance','MaterialsRheologyB'});
71 md = checkfield(md,'fieldname','inversion.nsteps','numel',1,'>=',0);
72 md = checkfield(md,'fieldname','inversion.maxiter_per_step','size',[md.inversion.nsteps 1],'>=',0);
73 md = checkfield(md,'fieldname','inversion.step_threshold','size',[md.inversion.nsteps 1]);
74- md = checkfield(md,'fieldname','inversion.cost_functions','size',[1 num_costfunc],'values',[101:105 201 501:506 601:604]);
75+ md = checkfield(md,'fieldname','inversion.cost_functions','size',[1 num_costfunc],'values',[101:105 201 501:507 601:604]);
76 md = checkfield(md,'fieldname','inversion.cost_functions_coefficients','size',[md.mesh.numberofvertices num_costfunc],'>=',0);
77 md = checkfield(md,'fieldname','inversion.gradient_scaling','size',[md.inversion.nsteps num_controls]);
78 md = checkfield(md,'fieldname','inversion.min_parameters','size',[md.mesh.numberofvertices num_controls]);
79@@ -241,6 +241,7 @@
80 pos=find(obj.cost_functions==504); data(pos)=ThicknessAlongGradientEnum();
81 pos=find(obj.cost_functions==505); data(pos)=ThicknessAcrossGradientEnum();
82 pos=find(obj.cost_functions==506); data(pos)=BalancethicknessMisfitEnum();
83+ pos=find(obj.cost_functions==507); data(pos)=RheologyBAbsGradientEnum();
84 pos=find(obj.cost_functions==601); data(pos)=SurfaceAbsMisfitEnum();
85 WriteData(fid,'data',data,'enum',InversionCostFunctionsEnum(),'format','DoubleMat','mattype',3);
86 WriteData(fid,'data',num_cost_functions,'enum',InversionNumCostFunctionsEnum(),'format','Integer');
87Index: ../trunk-jpl/src/m/classes/clusters/greenplanet.m
88===================================================================
89--- ../trunk-jpl/src/m/classes/clusters/greenplanet.m (revision 18823)
90+++ ../trunk-jpl/src/m/classes/clusters/greenplanet.m (revision 18824)
91@@ -8,17 +8,17 @@
92 classdef greenplanet
93 properties (SetAccess=public)
94 % {{{
95- name='greenplanet'
96- login='';
97- numnodes=20;
98- cpuspernode=8;
99- port=8000;
100- queue='c6145';
101- codepath='';
102- executionpath='';
103- interactive=0;
104- time=24*60;
105- memory=2;
106+ name = 'greenplanet'
107+ login = '';
108+ numnodes = 20;
109+ cpuspernode = 8;
110+ port = 8000;
111+ queue = 'c6145';
112+ codepath = '';
113+ executionpath = '';
114+ interactive = 0;
115+ time = 24*60;
116+ memory = 2;
117 end
118 properties (SetAccess=private)
119 np=20*8;
Note: See TracBrowser for help on using the repository browser.