Changeset 20023

Timestamp:

01/29/16 17:16:08 (9 years ago)

Author:

Eric.Larour

Message:

CHG: use precomputed legendre polynomial values if requested.

File:

• issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (modified) (4 diffs)

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

@@ -3558 +3558 @@
         /*recover legendre coefficients if they have been precomputed:*/
         this->parameters->FindParam(&legendre_precompute,SealevelriseLegendrePrecomputeEnum);
-        if(legendre_precompute)this->parameters->FindParam(&legendre_coefficients,&M,NULL,SealevelriseLegendreCoefficientsEnum);
+        if(legendre_precompute){
+                DoubleMatParam* parameter = static_cast<DoubleMatParam*>(this->parameters->FindParamObject(SealevelriseLegendreCoefficientsEnum)); _assert_(parameter);
+                parameter->GetParameterValueByPointer(&legendre_coefficients,NULL,&M);
+        }
 
         /*how many dofs are we working with here? */
@@ -3644 +3647 @@
                                 G_elastic = (love_k[nl-1]-love_h[nl-1])/2.0/sin(alpha/2.0);
                                 if(legendre_precompute){
-                                        for(int n=0;n<nl;n++) G_elastic += deltalove[n]*legendre_coefficients[reCast<int,IssmDouble>((M-1)*(cosalpha+1.0)/2.0)*nl+n];
+                                        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];
                                 }
                                 else{
@@ -3804 +3808 @@
                 /*recover legendre coefficients if they have been precomputed:*/
                 this->parameters->FindParam(&legendre_precompute,SealevelriseLegendrePrecomputeEnum);
-                if(legendre_precompute)this->parameters->FindParam(&legendre_coefficients,&M,NULL,SealevelriseLegendreCoefficientsEnum);
+                if(legendre_precompute){
+                        DoubleMatParam* parameter = static_cast<DoubleMatParam*>(this->parameters->FindParamObject(SealevelriseLegendreCoefficientsEnum)); _assert_(parameter);
+                        parameter->GetParameterValueByPointer(&legendre_coefficients,NULL,&M);
+                }
 
                 /*Speed up of love number comutation for elastic mode: */
@@ -3845 +3852 @@
                                 G_elastic[i] = (love_k[nl-1]-love_h[nl-1])/2.0/sin(alpha/2.0);
                                 if(legendre_precompute){
-                                        for(int n=0;n<nl;n++) G_elastic[i] += deltalove[n]*legendre_coefficients[reCast<int,IssmDouble>((M-1)*(cosalpha+1.0)/2.0)*nl+n];
+                                        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];
                                 }
                                 else{