Changeset 24964

Timestamp:

06/03/20 17:54:21 (5 years ago)

Author:

Eric.Larour

Message:

CHG: Casting of RESTRICT pointers.

File:

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

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

@@ -5597 +5597 @@
         #ifdef _HAVE_RESTRICT_ 
         IssmDouble* __restrict__ G=NULL;
-        IssmDouble* __restrict__GU=NULL;
-        IssmDouble* __restrict__GN=NULL;
-        IssmDouble* __restrict__GE=NULL;
-        IssmDouble* __restrict__G_elastic_precomputed=NULL;
-        IssmDouble* __restrict__G_rigid_precomputed=NULL;
-        IssmDouble* __restrict__U_elastic_precomputed=NULL;
-        IssmDouble* __restrict__H_elastic_precomputed=NULL;
+        IssmDouble* __restrict__ GU=NULL;
+        IssmDouble* __restrict__ GN=NULL;
+        IssmDouble* __restrict__ GE=NULL;
+        IssmDouble* __restrict__ G_elastic_precomputed=NULL;
+        IssmDouble* __restrict__ G_rigid_precomputed=NULL;
+        IssmDouble* __restrict__ U_elastic_precomputed=NULL;
+        IssmDouble* __restrict__ H_elastic_precomputed=NULL;
+        IssmDouble* __restrict__ indices=NULL;
         #else
         IssmDouble* G=NULL;
@@ -5613 +5614 @@
         IssmDouble* U_elastic_precomputed=NULL;
         IssmDouble* H_elastic_precomputed=NULL;
+        IssmDouble* indices=NULL;
         #endif
  
         /*elastic green function:*/
-        IssmDouble* indices=NULL;
         int index;
         int         M;
@@ -5636 +5637 @@
         /*recover precomputed green function kernels:*/
         DoubleVecParam* parameter = static_cast<DoubleVecParam*>(this->parameters->FindParamObject(SealevelriseGRigidEnum)); _assert_(parameter);
-        parameter->GetParameterValueByPointer(&G_rigid_precomputed,&M);
+        parameter->GetParameterValueByPointer((IssmDouble**)&G_rigid_precomputed,&M);
 
         parameter = static_cast<DoubleVecParam*>(this->parameters->FindParamObject(SealevelriseGElasticEnum)); _assert_(parameter);
-        parameter->GetParameterValueByPointer(&G_elastic_precomputed,&M);
+        parameter->GetParameterValueByPointer((IssmDouble**)&G_elastic_precomputed,&M);
 
         parameter = static_cast<DoubleVecParam*>(this->parameters->FindParamObject(SealevelriseHElasticEnum)); _assert_(parameter);
-        parameter->GetParameterValueByPointer(&H_elastic_precomputed,&M);
+        parameter->GetParameterValueByPointer((IssmDouble**)&H_elastic_precomputed,&M);
 
         parameter = static_cast<DoubleVecParam*>(this->parameters->FindParamObject(SealevelriseUElasticEnum)); _assert_(parameter);
-        parameter->GetParameterValueByPointer(&U_elastic_precomputed,&M);
+        parameter->GetParameterValueByPointer((IssmDouble**)&U_elastic_precomputed,&M);
 
         /*allocate indices:*/