Changeset 20054

Timestamp:

02/02/16 19:18:00 (9 years ago)

Author:

Eric.Larour

Message:

CHG: faster parallel way of precomputing legendre * love polynomial values.
Fixed huge bug for AD! Pn, Pn1 and Pn2 were not getting renewed!

File:

• issm/trunk-jpl/src/c/analyses/SealevelriseAnalysis.cpp (modified) (3 diffs)

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

@@ -73 +73 @@
                 
                 /*compute combined legendre + love number (elastic green function:*/
-                #ifdef _HAVE_ADOLC_
-                for(int i=0;i<M;i++){ 
-                        IssmDouble alpha,x;
-                        alpha= reCast<IssmDouble>(i)*degacc * PI / 180.0;
-
-                        G_elastic[i]= (love_k[nl-1]-love_h[nl-1])/2.0/sin(alpha/2.0);
-                        for (int n=0;n<nl;n++) {
-                                IssmDouble Pn,Pn1,Pn2;
-                                IssmDouble deltalove;
-
-                                deltalove = (love_k[n]-love_k[nl-1]-love_h[n]+love_h[nl-1]);
-
-                                if(n==0)Pn=1;
-                                else if(n==1)Pn=cos(alpha);
-                                else Pn= ( (2*n-1)*cos(alpha)*Pn1 - (n-1)*Pn2 ) /n;
-                                Pn2=Pn1; Pn1=Pn;
-
-                                G_elastic[i] += deltalove*Pn;
-                        }
-                }
-                #else
                 m=DetermineLocalSize(M,IssmComm::GetComm());
                 GetOwnershipBoundariesFromRange(&lower_row,&upper_row,m,IssmComm::GetComm());
@@ -103 +82 @@
 
                         G_elastic_local[i-lower_row]= (love_k[nl-1]-love_h[nl-1])/2.0/sin(alpha/2.0);
+                        IssmDouble Pn,Pn1,Pn2;
                         for (int n=0;n<nl;n++) {
-                                IssmDouble Pn,Pn1,Pn2;
                                 IssmDouble deltalove;
 
@@ -135 +114 @@
 
                 /*}}}*/
-                #endif
 
                 /*Avoid singularity at 0: */