Changeset 18010

Timestamp:

05/16/14 16:46:23 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added output

File:

• issm/trunk-jpl/src/c/cores/controlvalidation_core.cpp (modified) (3 diffs)

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

@@ -13 +13 @@
         int         solution_type,n;
         IssmDouble  j0,j;
-        IssmDouble  Ialpha,alpha;
+        IssmDouble  Ialpha,exponent,alpha;
         IssmDouble *G = NULL;
         IssmDouble *X = NULL;
@@ -51 +51 @@
         for(int i=0;i<n;i++) G[i] = -G[i];
 
-        _printf0_("j0 = "<<j0<<"\n");
-        for(IssmDouble exponent = 4.; exponent > -4. ; exponent-=0.2){
-        //for(IssmDouble exponent = -1.; exponent > -9. ; exponent-=0.2){
+        /*Range of tests*/
+        IssmDouble exp0 = 0.;
+        IssmDouble incr = -0.2;
+        IssmDouble exp1 = -8.;
+        int        num  = int((exp1-exp0)/incr);
 
-                alpha = pow(10.,exponent);
+        /*Allocate output*/
+        IssmDouble* output = xNew<IssmDouble>(2*num);
+
+        /*Start loop*/
+        _printf0_("       alpha      Ialpha \n");
+        _printf0_("_________________________\n");
+        for(int m=0;m<num;m++){
+
+                /*Calculate alpha = 10^-exponent*/
+                exponent = exp0+m*incr;
+                alpha    = pow(10.,exponent);
 
                 /*Create new vector*/
@@ -69 +81 @@
                 Ialpha = fabs((j - j0)/Den - 1.);
 
-                //_printf0_("alpha = "<<alpha<<" Ialpha = "<<Ialpha<<"\n");
-                _printf0_(alpha<<" "<<Ialpha<<"\n");
+
+                _printf0_(" " << setw(11) << setprecision (5)<<alpha<<" " << setw(11) << setprecision (5)<<Ialpha<<"\n");
+                output[m*2+0] = alpha;
+                output[m*2+1] = Ialpha;
         }
+
+        /*output*/
+        femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,JEnum,output,num,2,1,0));
 
         /*Clean up and return*/