Changeset 25388

Timestamp:

08/13/20 08:56:22 (5 years ago)

Author:

Mathieu Morlighem

Message:

NEW: allow for varying err when adapting meshes

Location:

issm/trunk-jpl/src/c

Files:

• bamg/Mesh.cpp (modified) (3 diffs)
• cores/controladm1qn3_core.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/bamg/Mesh.cpp

@@ -1007 +1007 @@
                 int Hessiantype=bamgopts->Hessiantype;
 
+                /*Check err, we need to make sure it has the right size!*/
+                if(bamgopts->errSize[0]==1){
+                        /*Let's copy this value for all vertices*/
+                        double* newerr =  new double[nbv*bamgopts->errSize[1]];
+                        for(int i=0;i<nbv;i++){
+                                for(int j=0;j<bamgopts->errSize[1];j++){
+                                        newerr[i*bamgopts->errSize[1]+j] = bamgopts->err[j];
+                                }
+                        }
+                        delete bamgopts->err;
+                        bamgopts->err = newerr;
+                        bamgopts->errSize[0] = nbv;
+                }
+                else if(bamgopts->errSize[0]==this->nbv){
+                        /*Nothing to do, already right size*/
+                }
+                else{
+                        _error_("number of rows in 'err' not supported");
+                }
+
                 if (Hessiantype==0){
                         BuildMetric0(bamgopts);
@@ -1819 +1839 @@
                         /*Compute Metric from Hessian*/
                         for ( iv=0;iv<nbv;iv++){
-                                vertices[iv].MetricFromHessian(dxdx_vertex[iv],dxdy_vertex[iv],dydy_vertex[iv],smin,smax,ss[iv*nbsol+nusol],bamgopts->err[nusol],bamgopts);
+                                vertices[iv].MetricFromHessian(dxdx_vertex[iv],dxdy_vertex[iv],dydy_vertex[iv],smin,smax,ss[iv*nbsol+nusol],bamgopts->err[iv*nbsol+nusol],bamgopts);
                         }
 
@@ -2129 +2149 @@
                                 /*Compute Metric from Hessian*/
                                 for ( iv=0;iv<nbv;iv++){
-                                        vertices[iv].MetricFromHessian(dxdx[iv],dxdy[iv],dydy[iv],smin,smax,ss[iv*nbsol+nusol],bamgopts->err[nusol],bamgopts);
+                                        vertices[iv].MetricFromHessian(dxdx[iv],dxdy[iv],dydy[iv],smin,smax,ss[iv*nbsol+nusol],bamgopts->err[iv*nbsol+nusol],bamgopts);
                                 }
 

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

@@ -260 +260 @@
         solutioncore(femmodel);
 
-        /*Reset the time to zero for next optimization*/
+        /*Reset the time to zero for next optimization (FIXME: this may actually not be needed)*/
         if(solution_type==TransientSolutionEnum){
                 IssmDouble restart_time;