Changeset 24926

Timestamp:

05/29/20 22:17:06 (5 years ago)

Author:

Eric.Larour

Message:

CHG: verbose statements for sea level core solution.
Also implemneted a GetArrayPtr for inputs2.

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Tria.cpp (modified) (7 diffs)
• classes/Inputs2/ArrayInput2.cpp (modified) (1 diff)
• classes/Inputs2/ArrayInput2.h (modified) (1 diff)
• classes/Inputs2/Inputs2.cpp (modified) (1 diff)
• classes/Inputs2/Inputs2.h (modified) (1 diff)
• cores/sealevelrise_core.cpp (modified) (4 diffs)

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

@@ -5644 +5644 @@
                 lati=latitude[i]/180*PI; longi=longitude[i]/180*PI;
                 delPhi=fabs(lati-late); delLambda=fabs(longi-longe);
-                alpha=2.*asin(sqrt(pow(sin(delPhi/2),2.0)+cos(lati)*cos(late)*pow(sin(delLambda/2),2)));
+                alpha=2.*asin(sqrt(pow(sin(delPhi/2),2)+cos(lati)*cos(late)*pow(sin(delLambda/2),2)));
                 indices[i]=reCast<int,IssmDouble>(alpha/PI*reCast<IssmDouble,int>(M-1));
         }
@@ -5754 +5754 @@
 
         /*retrieve indices:*/
-        if(computerigid){this->inputs2->GetArray(SealevelriseIndicesEnum,this->lid,&indices,&dummy); _assert_(dummy==gsize);}
+        if(computerigid){this->inputs2->GetArrayPtr(SealevelriseIndicesEnum,this->lid,&indices,&dummy); _assert_(dummy==gsize);}
 
         /*Compute area of element. Scale it by grounded fraction if not fully grounded: */
@@ -5823 +5823 @@
                 }
         }
-
-        /*Free ressources:*/
-        if(computerigid)xDelete<IssmDouble>(indices);
 
         /*Assign output pointer:*/
@@ -6035 +6032 @@
 
         /*retrieve indices:*/
-        if(computerigid){this->inputs2->GetArray(SealevelriseIndicesEnum,this->lid,&indices,&dummy); _assert_(dummy==gsize);}
+        if(computerigid){this->inputs2->GetArrayPtr(SealevelriseIndicesEnum,this->lid,&indices,&dummy); _assert_(dummy==gsize);}
 
         /*From Sg_old, recover water sea level rise:*/
@@ -6074 +6071 @@
                 }
         }
-
-        /*Free ressources:*/
-        if(computerigid)xDelete<IssmDouble>(indices);
 
 
@@ -6144 +6138 @@
 
         /*retrieve indices:*/
-        if(computerigid){this->inputs2->GetArray(SealevelriseIndicesEnum,this->lid,&indices,&dummy); _assert_(dummy==gsize);}
+        if(computerigid){this->inputs2->GetArrayPtr(SealevelriseIndicesEnum,this->lid,&indices,&dummy); _assert_(dummy==gsize);}
 
         /*compute area of element:*/
@@ -6238 +6232 @@
 
         /*free ressources:*/
-        if(computerigid)xDelete<IssmDouble>(indices);
         xDelete<IssmDouble>(U_values);
         xDelete<IssmDouble>(U_elastic);

issm/trunk-jpl/src/c/classes/Inputs2/ArrayInput2.cpp

@@ -131 +131 @@
 }
 /*}}}*/
+void ArrayInput2::GetArrayPtr(int row,IssmDouble** pvalues,int* pN){/*{{{*/
+
+        _assert_(this);
+        _assert_(row>=0 && row<this->numberofelements_local);
+        if(pvalues){
+                *pvalues = this->values[row];
+        }
+        if(pN){
+                *pN = this->N[row];
+        }
+}
+/*}}}*/

issm/trunk-jpl/src/c/classes/Inputs2/ArrayInput2.h

@@ -29 +29 @@
                 void SetInput(int row,int numinds,IssmDouble* values_in);
                 void GetArray(int row,IssmDouble** pvalues,int* pN);
+                void GetArrayPtr(int row,IssmDouble** pvalues,int* pN);
 
 };

issm/trunk-jpl/src/c/classes/Inputs2/Inputs2.cpp

@@ -449 +449 @@
         return xDynamicCast<ControlInput2*>(input);
 }/*}}}*/
+void Inputs2::GetArrayPtr(int enum_in,int row,IssmDouble** pvalues,int* pN){/*{{{*/
+
+        /*Get input id*/
+        int id = EnumToIndex(enum_in);
+
+        /*Create it if necessary*/
+        if(this->inputs[id]){
+                if(this->inputs[id]->ObjectEnum()!=ArrayInput2Enum) _error_(EnumToStringx(this->inputs[id]->ObjectEnum())<<" cannot return an array");
+        }
+        else{
+                _error_("Input "<<EnumToStringx(enum_in)<<" not found");
+        }
+
+        /*Set input*/
+        ArrayInput2* input = xDynamicCast<ArrayInput2*>(this->inputs[id]);
+        input->GetArrayPtr(row,pvalues,pN);
+}/*}}}*/
 void Inputs2::GetArray(int enum_in,int row,IssmDouble** pvalues,int* pN){/*{{{*/
 

issm/trunk-jpl/src/c/classes/Inputs2/Inputs2.h

@@ -51 +51 @@
                 void     GetInputsInterpolations(int* pnuminputs,int** pinterpolations,int** penum);
                 void             GetArray(int enum_in,int row,IssmDouble** pvalues,int* pN);
+                void             GetArrayPtr(int enum_in,int row,IssmDouble** pvalues,int* pN);
                 SegInput2*       GetSegInput(int enum_type);
                 TriaInput2*      GetTriaInput(int enum_type);

issm/trunk-jpl/src/c/cores/sealevelrise_core.cpp

@@ -351 +351 @@
         /*outputs:*/
         IssmDouble eustatic;
+        
+        if(VerboseSolution()) _printf0_("         computing eustatic components on ice\n");
 
         /*recover parameters:*/
@@ -416 +418 @@
         IssmDouble                      Ixz, Iyz, Izz; 
         int                      loop;
+        
+        if(VerboseSolution()) _printf0_("         converging on ocean components\n");
 
         /*Recover some parameters: */
@@ -530 +534 @@
         int  loop;
         int  horiz;
+        
+        if(VerboseSolution()) _printf0_("         computing vertical and horizontal geodetic signatures\n");
 
         /*retrieve some parameters:*/
@@ -577 +583 @@
         int                                     frequency;
         IssmDouble          dt;
+        
+        if(VerboseSolution()) _printf0_("         computing viscous components\n");
 
         /*retrieve some parameters:*/