Changeset 21742

Timestamp:

05/23/17 14:57:13 (8 years ago)

Author:

Eric.Larour

Message:

CHG: shield ensureContiguous statement.

File:

• issm/trunk-jpl/src/c/analyses/SealevelriseAnalysis.cpp (modified) (1 diff)

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

@@ -90 +90 @@
                 iomodel->FetchData(&degacc,"md.slr.degacc");
                 M=reCast<int,IssmDouble>(180./degacc+1.);
+
+                // AD performance is sensitive to calls to ensurecontiguous.
+                // // Providing "t" will cause ensurecontiguous to be called.
+                #ifdef _HAVE_AD_
                 G_elastic=xNew<IssmDouble>(M,"t");
                 U_elastic=xNew<IssmDouble>(M,"t");
                 H_elastic=xNew<IssmDouble>(M,"t");
+                #else
+                G_elastic=xNew<IssmDouble>(M);
+                U_elastic=xNew<IssmDouble>(M);
+                H_elastic=xNew<IssmDouble>(M);
+                #endif
+
                 
                 /*compute combined legendre + love number (elastic green function:*/
                 m=DetermineLocalSize(M,IssmComm::GetComm());
                 GetOwnershipBoundariesFromRange(&lower_row,&upper_row,m,IssmComm::GetComm());
+                // AD performance is sensitive to calls to ensurecontiguous.
+                // // Providing "t" will cause ensurecontiguous to be called.
+                #ifdef _HAVE_AD_
                 G_elastic_local=xNew<IssmDouble>(m,"t");
                 U_elastic_local=xNew<IssmDouble>(m,"t");
                 H_elastic_local=xNew<IssmDouble>(m,"t");
+                #else
+                G_elastic_local=xNew<IssmDouble>(m);
+                U_elastic_local=xNew<IssmDouble>(m);
+                H_elastic_local=xNew<IssmDouble>(m);
+                #endif
 
                 for(int i=lower_row;i<upper_row;i++){