Changeset 24099

Timestamp:

07/18/19 01:55:59 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removing cores/controlad_core.cpp, dead branche

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• cores/controlad_core.cpp (deleted)
• cores/controladm1qn3_core.cpp (modified) (5 diffs)
• cores/cores.h (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -295 +295 @@
                                         ./cores/control_core.cpp\
                                         ./cores/controltao_core.cpp\
-                                        ./cores/controlad_core.cpp\
                                         ./cores/controlm1qn3_core.cpp\
                                         ./cores/controladm1qn3_core.cpp\

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

@@ -190 +190 @@
         if(solution_type == TransientSolutionEnum) femmodel = input_struct->femmodel->copy();
 
-        IssmPDouble*  Jlist        = input_struct->Jlist;
-        int           JlistM       = input_struct->M;
-        int           JlistN       = input_struct->N;
-        int*          Jlisti       = input_struct->i;
-        int           intn         = (int)*n;
+        IssmPDouble*  Jlist  = input_struct->Jlist;
+        int           JlistM = input_struct->M;
+        int           JlistN = input_struct->N;
+        int*          Jlisti = input_struct->i;
+        int           intn   = (int)*n;
 
         /*Recover some parameters*/
@@ -267 +267 @@
                 femmodel->parameters->FindParam(&restart_time,TimesteppingStartTimeEnum);
                 femmodel->parameters->SetParam(restart_time,TimeEnum);
-
         }
 
         /*Get Dependents*/
-        IssmDouble  output_value;
-        int         num_dependents;
+        IssmDouble   output_value;
+        int          num_dependents;
         IssmPDouble *dependents;
-        DataSet*    dependent_objects=NULL;
-        IssmDouble      J=0.;
+        DataSet     *dependent_objects = NULL;
+        IssmDouble   J                 = 0.;
         femmodel->parameters->FindParam(&num_dependents,AutodiffNumDependentsEnum);
         femmodel->parameters->FindParam(&dependent_objects,AutodiffDependentObjectsEnum);
@@ -378 +377 @@
         /* call the fos_reverse in a loop on the index, from 0 to num_dependents, so
          * as to generate num_dependents gradients: */
-        for(int aDepIndex=0;aDepIndex<num_dependents_old;aDepIndex++){
+        for(int dep_index=0;dep_index<num_dependents_old;dep_index++){
 
                 /*initialize direction index in the weights vector: */
-                aWeightVector=xNewZeroInit<IssmPDouble>(num_dependents);
                 if(my_rank==0){
-                        if(aDepIndex<0 || aDepIndex>=num_dependents || codi_global.output_indices.size() <= aDepIndex){
-                                _error_("index value for AutodiffFosReverseIndexEnum should be in [0,num_dependents-1]");
+                        if(dep_index<0 || dep_index>=num_dependents || codi_global.output_indices.size() <= dep_index){
+                                _error_("index value for dependent index should be in [0,num_dependents-1]");
                         }
-                        tape_codi.setGradient(codi_global.output_indices[aDepIndex],1.0);
+                        tape_codi.setGradient(codi_global.output_indices[dep_index],1.0);
                 }
                 tape_codi.evaluate();
@@ -393 +391 @@
                 weightVectorTimesJac=xNew<IssmPDouble>(num_independents);
                 auto in_size = codi_global.input_indices.size();
-                for(size_t i = 0; i < in_size; ++i) {
+                for(size_t i = 0; i < in_size; ++i){
                         _assert_(i<num_independents);
                         weightVectorTimesJac[i] = tape_codi.getGradient(codi_global.input_indices[i]);
                 }
-                if(my_rank==0) for(int i=0;i<num_independents;i++) {
+                if(my_rank==0) for(int i=0;i<num_independents;i++){
                         totalgradient[i]+=weightVectorTimesJac[i];
                 }
-                /*free resources :*/
                 xDelete(weightVectorTimesJac);
-                xDelete(aWeightVector);
         }
         /*}}}*/
@@ -470 +466 @@
         xDelete<IssmDouble>(scaling_factors);
         xDelete<IssmPDouble>(totalgradient);
-
 }/*}}}*/
 void controladm1qn3_core(FemModel* femmodel){/*{{{*/

issm/trunk-jpl/src/c/cores/cores.h

@@ -31 +31 @@
 void controlm1qn3_core(FemModel* femmodel);
 void controladm1qn3_core(FemModel* femmodel);
-void controlad_core(FemModel* femmodel);
 void controlvalidation_core(FemModel* femmodel);
 void masstransport_core(FemModel* femmodel);