Changeset 25320

Timestamp:

07/31/20 10:31:31 (5 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed AD

File:

• issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp

@@ -215 +215 @@
         int*                            types                                                   = NULL;
         int*                            control_sizes                           = NULL;
-        int*                            M_all                                                   = NULL;
         IssmDouble*             independent                                     = NULL;
         IssmDouble*             independents_fullmin    = NULL;
@@ -233 +232 @@
         iomodel->FetchData(&types,NULL,NULL,"md.autodiff.independent_object_types");
 
-        M_all = xNew<int>(num_independent_objects);
+        int* M_all = xNew<int>(num_independent_objects);
+        int* N_all = xNew<int>(num_controls);
+        int* Interp_all = xNew<int>(num_controls);
 
         /*create independent objects, and at the same time, fetch the corresponding independent variables, 
@@ -277 +278 @@
                         else M_all[i]=M;
 
+                        if(M_all[i]==iomodel->numberofvertices){
+                                Interp_all[i] = P1Enum;
+                        }
+                        else if(M_all[i]==iomodel->numberofelements){
+                                Interp_all[i] = P0Enum;
+                        }
+                        else{
+                                _error_("Control size not supported");
+                        }
+                        N_all[i] = N;
+
+
                         for(int j=0;j<elements->Size();j++){
                                 Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(j));
@@ -290 +303 @@
                 }
         }
-        parameters->AddObject(new IntVecParam(ControlInputSizeNEnum,control_sizes,num_independent_objects));
+        parameters->AddObject(new IntVecParam(ControlInputSizeNEnum,N_all,num_independent_objects));
         parameters->AddObject(new IntVecParam(ControlInputSizeMEnum,M_all,num_independent_objects));
+        parameters->AddObject(new IntVecParam(ControlInputInterpolationEnum,Interp_all,num_controls));
 
         /*cleanup*/
@@ -300 +314 @@
         xDelete<int>(types);
         xDelete<int>(M_all);
+        xDelete<int>(N_all);
+        xDelete<int>(Interp_all);
         xDelete<IssmDouble>(independents_fullmin);
         xDelete<IssmDouble>(independents_fullmax);