Changeset 25578

Timestamp:

09/17/20 12:08:07 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing problem with dependents that are COPIED from femmodel, creating confusion

Location:

issm/trunk-jpl/src/c/cores

Files:

• controladm1qn3_core.cpp (modified) (2 diffs)
• controlvalidation_core.cpp (modified) (2 diffs)
• transient_core.cpp (modified) (7 diffs)

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

@@ -271 +271 @@
         int          num_dependents;
         IssmPDouble *dependents;
-        DataSet     *dependent_objects = NULL;
-        IssmDouble   J                 = 0.;
+        IssmDouble   J = 0.;
+        DataSet     *dependent_objects = ((DataSetParam*)femmodel->parameters->FindParamObject(AutodiffDependentObjectsEnum))->value;
         femmodel->parameters->FindParam(&num_dependents,AutodiffNumDependentsEnum);
-        femmodel->parameters->FindParam(&dependent_objects,AutodiffDependentObjectsEnum);
 
         /*Go through our dependent variables, and compute the response:*/
@@ -471 +470 @@
         xDelete<IssmPDouble>(dependents);
         xDelete<IssmPDouble>(totalgradient);
-        delete dependent_objects;
 }/*}}}*/
 void controladm1qn3_core(FemModel* femmodel){/*{{{*/

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

@@ -209 +209 @@
         int         num_dependents;
         IssmPDouble *dependents;
-        DataSet*    dependent_objects=NULL;
+        DataSet     *dependent_objects = ((DataSetParam*)femmodel->parameters->FindParamObject(AutodiffDependentObjectsEnum))->value;
         IssmDouble      J=0.;
         femmodel->parameters->FindParam(&num_dependents,AutodiffNumDependentsEnum);
-        femmodel->parameters->FindParam(&dependent_objects,AutodiffDependentObjectsEnum);
 
         /*Go through our dependent variables, and compute the response:*/
@@ -340 +339 @@
         xDelete<double>(X0);
         xDelete<IssmDouble>(scaling_factors);
-        #if defined(_HAVE_CODIPACK_)
-        delete dependent_objects;
-        #endif
 }

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

@@ -62 +62 @@
         #endif
 
-        DataSet* dependent_objects=NULL;
-        if(iscontrol && isautodiff){
-                femmodel->parameters->FindParam(&dependent_objects,AutodiffDependentObjectsEnum);
-        }
-
         if(isslr) sealevelrise_core_geometry(femmodel);
 
@@ -128 +123 @@
                 if(iscontrol && isautodiff){
                         /*Go through our dependent variables, and compute the response:*/
+                        DataSet* dependent_objects=((DataSetParam*)femmodel->parameters->FindParamObject(AutodiffDependentObjectsEnum))->value;
                         for(Object* & object:dependent_objects->objects){
                                 DependentObject* dep=(DependentObject*)object;
@@ -138 +134 @@
 
         if(!iscontrol || !isautodiff) femmodel->RequestedDependentsx();
-        if(iscontrol && isautodiff) femmodel->parameters->SetParam(dependent_objects,AutodiffDependentObjectsEnum);
-
 }/*}}}*/
 void transient_step(FemModel* femmodel){/*{{{*/
@@ -277 +271 @@
         int        step,timestepping;
         int        recording_frequency;
-        DataSet*   dependent_objects=NULL;
+
+        /*Get rank*/
+        int my_rank = IssmComm::GetRank();
 
         /*then recover parameters common to all solutions*/
@@ -286 +282 @@
         femmodel->parameters->FindParam(&timestepping,TimesteppingTypeEnum);
         femmodel->parameters->FindParam(&isslr,TransientIsslrEnum);
-        femmodel->parameters->FindParam(&dependent_objects,AutodiffDependentObjectsEnum);
         femmodel->parameters->FindParam(&recording_frequency,SettingsRecordingFrequencyEnum); _assert_(recording_frequency>0);
         if(isslr) sealevelrise_core_geometry(femmodel);
@@ -338 +333 @@
 
                 /*Go through our dependent variables, and compute the response:*/
+                DataSet* dependent_objects=((DataSetParam*)femmodel->parameters->FindParamObject(AutodiffDependentObjectsEnum))->value;
                 for(Object* & object:dependent_objects->objects){
                         DependentObject* dep=(DependentObject*)object;
@@ -378 +374 @@
         femmodel->Marshall(hdl_regin);
         delete hdl_regin;
-        for(int i=0; i < Xsize; i++) tape_codi.registerInput(X[i]);
-
+        if(my_rank==0) for(int i=0; i < Xsize; i++) tape_codi.registerInput(X[i]);
         SetControlInputsFromVectorx(femmodel,X);
 
         IssmDouble J = 0.;
         if(0){
+                DataSet* dependent_objects=((DataSetParam*)femmodel->parameters->FindParamObject(AutodiffDependentObjectsEnum))->value;
                 for(Object* & object:dependent_objects->objects){
                         DependentObject* dep=(DependentObject*)object;