Changeset 20044

Timestamp:

01/31/16 21:22:36 (9 years ago)

Author:

Eric.Larour

Message:

CHG: not working because probably of the MPI_AllGatherv operation.

File:

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

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

@@ -71 +71 @@
                 M=reCast<int,IssmDouble>(180./degacc+1.);
                 G_elastic=xNew<IssmDouble>(M);
+                
+                /*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;
 
-                /*compute combined legendre + love number (elastic green function:*/
+                        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());
@@ -114 +135 @@
 
                 /*}}}*/
-
-                /*Old code: {{{*/
-                /*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;
-                        }
-                }*/ 
-                /*}}}*/
+                #endif
 
                 /*Avoid singularity at 0: */