Changeset 20027

Timestamp:

01/29/16 18:48:16 (9 years ago)

Author:

Eric.Larour

Message:

CHG: speed up of the precompute sea level rise core by transposing the legendre polynomial values matrix.

Location:

issm/trunk-jpl/src/c

Files:

• analyses/SealevelriseAnalysis.cpp (modified) (1 diff)
• classes/Elements/Tria.cpp (modified) (4 diffs)
• shared/Numerics/legendre.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/SealevelriseAnalysis.cpp

@@ -75 +75 @@
                 /*compute legendre coefficient matrix:*/
                 legendre_coefficients=p_polynomial_value(M,nl-1,x);
-                parameters->AddObject(new DoubleMatParam(SealevelriseLegendreCoefficientsEnum,legendre_coefficients,nl,M));
+                parameters->AddObject(new DoubleMatParam(SealevelriseLegendreCoefficientsEnum,legendre_coefficients,M,nl));
 
                 /*free ressources:*/

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -3560 +3560 @@
         if(legendre_precompute){
                 DoubleMatParam* parameter = static_cast<DoubleMatParam*>(this->parameters->FindParamObject(SealevelriseLegendreCoefficientsEnum)); _assert_(parameter);
-                parameter->GetParameterValueByPointer(&legendre_coefficients,NULL,&M);
+                parameter->GetParameterValueByPointer(&legendre_coefficients,&M,NULL);
         }
 
@@ -3648 +3648 @@
                                 if(legendre_precompute){
                                         int index=reCast<int,IssmDouble>((M-1)*(1-alpha/PI));
-                                        for(int n=0;n<nl;n++) G_elastic += deltalove[n]*legendre_coefficients[M*n + index];
+                                        for(int n=0;n<nl;n++) G_elastic += deltalove[n]*legendre_coefficients[index*nl+n];
                                 }
                                 else{
@@ -3810 +3810 @@
                 if(legendre_precompute){
                         DoubleMatParam* parameter = static_cast<DoubleMatParam*>(this->parameters->FindParamObject(SealevelriseLegendreCoefficientsEnum)); _assert_(parameter);
-                        parameter->GetParameterValueByPointer(&legendre_coefficients,NULL,&M);
+                        parameter->GetParameterValueByPointer(&legendre_coefficients,&M,NULL);
                 }
 
@@ -3853 +3853 @@
                                 if(legendre_precompute){
                                         int index=reCast<int,IssmDouble>((M-1)*(1-alpha/PI));
-                                        for(int n=0;n<nl;n++) G_elastic[i] += deltalove[n]*legendre_coefficients[M*n + index];
+                                        for(int n=0;n<nl;n++) G_elastic[i] += deltalove[n]*legendre_coefficients[index*nl+n];
                                 }
                                 else{

issm/trunk-jpl/src/c/shared/Numerics/legendre.cpp

@@ -249 +249 @@
         v = xNew<IssmDouble>(m*(n+1));
 
-        for ( i = 0; i < m; i++ ) v[i+0*m] = 1.0;
+        for ( i = 0; i < m; i++ ) v[i*(n+1)+0] = 1.0;
         if ( n < 1 ) return v;
 
-        for ( i = 0; i < m; i++ ) v[i+1*m] = x[i];
-
-        for ( j = 2; j <= n; j++ ) {
-                for ( i = 0; i < m; i++ ) {
-                        v[i+j*m] = ( ( IssmDouble ) ( 2 * j - 1 ) * x[i] * v[i+(j-1)*m]
-                                        - ( IssmDouble ) (     j - 1 ) *        v[i+(j-2)*m] )
+        for ( i = 0; i < m; i++ ) v[i*(n+1)+1] = x[i];
+
+        for ( i = 0; i < m; i++ ) {
+                for ( j = 2; j <= n; j++ ) {
+                        
+                        v[j+i*(n+1)] = ( ( IssmDouble ) ( 2 * j - 1 ) * x[i] * v[(j-1)+i*(n+1)]
+                                        - ( IssmDouble ) (     j - 1 ) *        v[(j-2)+i*(n+1)] )
                                 / ( IssmDouble ) (     j     );
+
                 }
         }