source: issm/oecreview/Archive/21724-22754/ISSM-22518-22519.diff@ 22755

Last change on this file since 22755 was 22755, checked in by Mathieu Morlighem, 7 years ago

CHG: added 21724-22754
File size: 12.7 KB
RevLine 
[22755]1Index: ../trunk-jpl/src/c/classes/Inputs/SegInput.h
2===================================================================
3--- ../trunk-jpl/src/c/classes/Inputs/SegInput.h (revision 22518)
4+++ ../trunk-jpl/src/c/classes/Inputs/SegInput.h (revision 22519)
5@@ -61,7 +61,6 @@
6 void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime){_error_("not implemented yet");};
7 void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist){_error_("not implemented yet");};
8 int GetInputInterpolationType(){_error_("not implemented yet!");};
9- IssmDouble InfinityNorm(void){_error_("not implemented yet");};
10 IssmDouble Max(void);
11 IssmDouble MaxAbs(void){_error_("not implemented yet");};
12 IssmDouble Min(void);
13Index: ../trunk-jpl/src/c/classes/Inputs/TetraInput.h
14===================================================================
15--- ../trunk-jpl/src/c/classes/Inputs/TetraInput.h (revision 22518)
16+++ ../trunk-jpl/src/c/classes/Inputs/TetraInput.h (revision 22519)
17@@ -61,7 +61,6 @@
18 void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime);
19 void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist);
20 int GetInputInterpolationType(){_error_("not implemented yet!");};
21- IssmDouble InfinityNorm(void);
22 IssmDouble Max(void);
23 IssmDouble MaxAbs(void);
24 IssmDouble Min(void);
25Index: ../trunk-jpl/src/c/classes/Inputs/Input.h
26===================================================================
27--- ../trunk-jpl/src/c/classes/Inputs/Input.h (revision 22518)
28+++ ../trunk-jpl/src/c/classes/Inputs/Input.h (revision 22519)
29@@ -43,7 +43,6 @@
30 virtual void AXPY(Input* xinput,IssmDouble scalar)=0;
31 virtual void Extrude(int start)=0;
32 virtual void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist)=0;
33- virtual IssmDouble InfinityNorm(void)=0;
34 virtual IssmDouble Max(void)=0;
35 virtual IssmDouble MaxAbs(void)=0;
36 virtual IssmDouble Min(void)=0;
37Index: ../trunk-jpl/src/c/classes/Inputs/ControlInput.h
38===================================================================
39--- ../trunk-jpl/src/c/classes/Inputs/ControlInput.h (revision 22518)
40+++ ../trunk-jpl/src/c/classes/Inputs/ControlInput.h (revision 22519)
41@@ -66,7 +66,6 @@
42 int GetResultNumberOfNodes(void);
43 void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist,const char* data);
44 void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist);
45- IssmDouble InfinityNorm(void){_error_("not implemented yet");};
46 IssmDouble Max(void){_error_("not implemented yet");};
47 IssmDouble MaxAbs(void){_error_("not implemented yet");};
48 IssmDouble Min(void);
49Index: ../trunk-jpl/src/c/classes/Inputs/DatasetInput.h
50===================================================================
51--- ../trunk-jpl/src/c/classes/Inputs/DatasetInput.h (revision 22518)
52+++ ../trunk-jpl/src/c/classes/Inputs/DatasetInput.h (revision 22519)
53@@ -62,7 +62,6 @@
54 int GetResultInterpolation(void){_error_("not implemented yet");};
55 int GetResultNumberOfNodes(void){_error_("not implemented yet");};
56 void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist){_error_("not implemented yet");};
57- IssmDouble InfinityNorm(void){_error_("not implemented yet");};
58 IssmDouble Max(void){_error_("not implemented yet");};
59 IssmDouble MaxAbs(void){_error_("not implemented yet");};
60 IssmDouble Min(void){_error_("not implemented yet");};
61Index: ../trunk-jpl/src/c/classes/Inputs/IntInput.h
62===================================================================
63--- ../trunk-jpl/src/c/classes/Inputs/IntInput.h (revision 22518)
64+++ ../trunk-jpl/src/c/classes/Inputs/IntInput.h (revision 22519)
65@@ -60,7 +60,6 @@
66 void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime){_error_("not implemented yet");};
67 int GetInputInterpolationType(){_error_("not implemented yet!");};
68 void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist);
69- IssmDouble InfinityNorm(void){_error_("InfinityNorm not implemented for integers");};
70 IssmDouble Max(void){_error_("Max not implemented for integers");};
71 IssmDouble MaxAbs(void){_error_("Max not implemented for integers");};
72 IssmDouble Min(void){_error_("Min not implemented for integers");};
73Index: ../trunk-jpl/src/c/classes/Inputs/TriaInput.cpp
74===================================================================
75--- ../trunk-jpl/src/c/classes/Inputs/TriaInput.cpp (revision 22518)
76+++ ../trunk-jpl/src/c/classes/Inputs/TriaInput.cpp (revision 22519)
77@@ -275,16 +275,6 @@
78 const int numvertices=3;
79 vector->SetValues(numvertices,doflist,this->values,INS_VAL);
80 } /*}}}*/
81-IssmDouble TriaInput::InfinityNorm(void){/*{{{*/
82-
83- /*Output*/
84- IssmDouble norm=0.;
85- int numnodes=this->NumberofNodes(this->interpolation_type);
86-
87- for(int i=0;i<numnodes;i++) if(fabs(values[i])>norm) norm=fabs(values[i]);
88- return norm;
89-}
90-/*}}}*/
91 IssmDouble TriaInput::Max(void){/*{{{*/
92
93 int numnodes=this->NumberofNodes(this->interpolation_type);
94Index: ../trunk-jpl/src/c/classes/Inputs/BoolInput.h
95===================================================================
96--- ../trunk-jpl/src/c/classes/Inputs/BoolInput.h (revision 22518)
97+++ ../trunk-jpl/src/c/classes/Inputs/BoolInput.h (revision 22519)
98@@ -56,7 +56,6 @@
99 void GetInputValue(IssmDouble* pvalue,Gauss* gauss ,int index){_error_("not implemented yet");};
100 void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist);
101 int GetInputInterpolationType(){_error_("not implemented yet!");};
102- IssmDouble InfinityNorm(void){_error_("InfinityNorm not implemented for booleans");};
103 IssmDouble Max(void){_error_("Max not implemented for booleans");};
104 IssmDouble MaxAbs(void){_error_("Max not implemented for booleans");};
105 IssmDouble Min(void){_error_("Min not implemented for booleans");};
106Index: ../trunk-jpl/src/c/classes/Inputs/Inputs.cpp
107===================================================================
108--- ../trunk-jpl/src/c/classes/Inputs/Inputs.cpp (revision 22518)
109+++ ../trunk-jpl/src/c/classes/Inputs/Inputs.cpp (revision 22519)
110@@ -253,26 +253,6 @@
111
112 }
113 /*}}}*/
114-IssmDouble Inputs::InfinityNorm(int enumtype){/*{{{*/
115-
116- /*Output*/
117- IssmDouble norm;
118-
119- /*Get input*/
120- Input* input=xDynamicCast<Input*>(this->GetInput(enumtype));
121-
122- /*Apply ContrainMin: */
123- if (input){
124- norm=input->InfinityNorm();
125- }
126- else{
127- norm=0;
128- }
129-
130- /*Return output*/
131- return norm;
132-}
133-/*}}}*/
134 IssmDouble Inputs::Max(int enumtype){/*{{{*/
135
136 /*Output*/
137Index: ../trunk-jpl/src/c/classes/Inputs/TriaInput.h
138===================================================================
139--- ../trunk-jpl/src/c/classes/Inputs/TriaInput.h (revision 22518)
140+++ ../trunk-jpl/src/c/classes/Inputs/TriaInput.h (revision 22519)
141@@ -61,7 +61,6 @@
142 void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime);
143 int GetInputInterpolationType(){return interpolation_type;};
144 void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist);
145- IssmDouble InfinityNorm(void);
146 IssmDouble Max(void);
147 IssmDouble MaxAbs(void);
148 IssmDouble Min(void);
149Index: ../trunk-jpl/src/c/classes/Inputs/TransientInput.cpp
150===================================================================
151--- ../trunk-jpl/src/c/classes/Inputs/TransientInput.cpp (revision 22518)
152+++ ../trunk-jpl/src/c/classes/Inputs/TransientInput.cpp (revision 22519)
153@@ -527,25 +527,6 @@
154 delete input;
155
156 } /*}}}*/
157-IssmDouble TransientInput::InfinityNorm(void){/*{{{*/
158-
159- IssmDouble time;
160- IssmDouble infnorm;
161-
162- /*First, recover current time from parameters: */
163- parameters->FindParam(&time,TimeEnum);
164-
165- /*Retrieve interpolated values for this time step: */
166- Input* input=GetTimeInput(time);
167-
168- /*Call input function*/
169- infnorm=input->InfinityNorm();
170-
171- /*Clean-up and return*/
172- delete input;
173- return infnorm;
174-}
175-/*}}}*/
176 IssmDouble TransientInput::Max(void){/*{{{*/
177
178 IssmDouble time;
179Index: ../trunk-jpl/src/c/classes/Inputs/Inputs.h
180===================================================================
181--- ../trunk-jpl/src/c/classes/Inputs/Inputs.h (revision 22518)
182+++ ../trunk-jpl/src/c/classes/Inputs/Inputs.h (revision 22519)
183@@ -32,7 +32,6 @@
184 void GetInputValue(bool* pvalue,int enum_type);
185 void GetInputValue(int* pvalue,int enum_type);
186 void GetInputValue(IssmDouble* pvalue,int enum_type);
187- IssmDouble InfinityNorm(int enumtype);
188 IssmDouble Max(int enumtype);
189 IssmDouble MaxAbs(int enumtype);
190 IssmDouble Min(int enumtype);
191Index: ../trunk-jpl/src/c/classes/Inputs/PentaInput.cpp
192===================================================================
193--- ../trunk-jpl/src/c/classes/Inputs/PentaInput.cpp (revision 22518)
194+++ ../trunk-jpl/src/c/classes/Inputs/PentaInput.cpp (revision 22519)
195@@ -274,16 +274,6 @@
196 const int numvertices=6;
197 vector->SetValues(numvertices,doflist,this->values,INS_VAL);
198 } /*}}}*/
199-IssmDouble PentaInput::InfinityNorm(void){/*{{{*/
200-
201- /*Output*/
202- IssmDouble norm=0.;
203- int numnodes=this->NumberofNodes(this->interpolation_type);
204-
205- for(int i=0;i<numnodes;i++) if(fabs(values[i])>norm) norm=fabs(values[i]);
206- return norm;
207-}
208-/*}}}*/
209 IssmDouble PentaInput::Max(void){/*{{{*/
210
211 int numnodes=this->NumberofNodes(this->interpolation_type);
212Index: ../trunk-jpl/src/c/classes/Inputs/TransientInput.h
213===================================================================
214--- ../trunk-jpl/src/c/classes/Inputs/TransientInput.h (revision 22518)
215+++ ../trunk-jpl/src/c/classes/Inputs/TransientInput.h (revision 22519)
216@@ -70,7 +70,6 @@
217 int GetTimeInputOffset(IssmDouble time);
218 void GetTimeValues(IssmDouble* values,IssmDouble time){_error_("not implemented yet");};
219 void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist);
220- IssmDouble InfinityNorm(void);
221 IssmDouble Max(void);
222 IssmDouble MaxAbs(void);
223 IssmDouble Min(void);
224Index: ../trunk-jpl/src/c/classes/Inputs/PentaInput.h
225===================================================================
226--- ../trunk-jpl/src/c/classes/Inputs/PentaInput.h (revision 22518)
227+++ ../trunk-jpl/src/c/classes/Inputs/PentaInput.h (revision 22519)
228@@ -58,7 +58,6 @@
229 void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime){_error_("not implemented yet");};
230 void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist);
231 int GetInputInterpolationType(){_error_("not implemented yet!");};
232- IssmDouble InfinityNorm(void);
233 IssmDouble Max(void);
234 IssmDouble MaxAbs(void);
235 IssmDouble Min(void);
236Index: ../trunk-jpl/src/c/classes/Inputs/DoubleArrayInput.h
237===================================================================
238--- ../trunk-jpl/src/c/classes/Inputs/DoubleArrayInput.h (revision 22518)
239+++ ../trunk-jpl/src/c/classes/Inputs/DoubleArrayInput.h (revision 22519)
240@@ -58,7 +58,6 @@
241 void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime){_error_("not implemented yet");};
242 void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist){_error_("not implemented yet");};
243 int GetInputInterpolationType(){_error_("not implemented yet!");};
244- IssmDouble InfinityNorm(void){_error_("not implemented yet");};
245 IssmDouble Max(void){_error_("not implemented yet");};
246 IssmDouble MaxAbs(void){_error_("not implemented yet");};
247 IssmDouble Min(void){_error_("not implemented yet");};
248Index: ../trunk-jpl/src/c/classes/Inputs/TetraInput.cpp
249===================================================================
250--- ../trunk-jpl/src/c/classes/Inputs/TetraInput.cpp (revision 22518)
251+++ ../trunk-jpl/src/c/classes/Inputs/TetraInput.cpp (revision 22519)
252@@ -241,16 +241,6 @@
253 const int numvertices=4;
254 vector->SetValues(numvertices,doflist,this->values,INS_VAL);
255 } /*}}}*/
256-IssmDouble TetraInput::InfinityNorm(void){/*{{{*/
257-
258- /*Output*/
259- IssmDouble norm=0.;
260- int numnodes=this->NumberofNodes(this->interpolation_type);
261-
262- for(int i=0;i<numnodes;i++) if(fabs(values[i])>norm) norm=fabs(values[i]);
263- return norm;
264-}
265-/*}}}*/
266 IssmDouble TetraInput::MinAbs(void){/*{{{*/
267
268 const int numnodes=this->NumberofNodes(this->interpolation_type);
269Index: ../trunk-jpl/src/c/classes/Inputs/DoubleInput.h
270===================================================================
271--- ../trunk-jpl/src/c/classes/Inputs/DoubleInput.h (revision 22518)
272+++ ../trunk-jpl/src/c/classes/Inputs/DoubleInput.h (revision 22519)
273@@ -59,7 +59,6 @@
274 void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime){_error_("not implemented yet");};
275 int GetInputInterpolationType(){return P0Enum; };
276 void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist);
277- IssmDouble InfinityNorm(void){_error_("not implemented yet");};
278 IssmDouble Max(void);
279 IssmDouble MaxAbs(void);
280 IssmDouble Min(void);
Note: See TracBrowser for help on using the repository browser.