source: issm/oecreview/Archive/22755-22818/ISSM-22793-22794.diff

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

@@ -105 +105 @@
                         if(X[index]>XU[index]) X[index]=XU[index];
                         if(X[index]<XL[index]) X[index]=XL[index];
                 }
+                N_add+=N[c];
         }
 
         /*Start Tracing*/
@@ -319 +320 @@
                         X[index] = X[index]/reCast<double>(scaling_factors[c]);
                         Gnorm += G[index]*G[index];
                 }
+                N_add+=N[c];
         }
         Gnorm = sqrt(Gnorm);
 

../trunk-jpl/src/c/classes/Elements/Element.cpp

@@ -1661 +1661 @@
             IssmDouble* times = xNew<IssmDouble>(N);
             for(int t=0;t<N;t++) times[t] = vector[(M-1)*N+t];
                                 /*Create the three transient inputs for the control input*/
-            TransientInput* values_input=new TransientInput(ControlInputValuesEnum,times,N);
+            TransientInput* values_input=new TransientInput(input_enum,times,N);
                                 TransientInput* mins_input = new TransientInput(ControlInputMinsEnum,times,N);
                                 TransientInput* maxs_input = new TransientInput(ControlInputMaxsEnum,times,N);
                            TransientInput* grad_input = new TransientInput(ControlInputGradEnum);
@@ -1673 +1673 @@
                                          } 
                                         switch(this->ObjectEnum()){
                     case TriaEnum:
-                                                                        values_input->AddTimeInput(new TriaInput(ControlInputValuesEnum,values,P1Enum)); 
+                                                                        values_input->AddTimeInput(new TriaInput(input_enum,values,P1Enum)); 
                                                                         mins_input->AddTimeInput(new TriaInput(ControlInputMinsEnum,values_min,P1Enum)); 
                                                                         maxs_input->AddTimeInput(new TriaInput(ControlInputMaxsEnum,values_max,P1Enum));
                                                                 break;

../trunk-jpl/src/c/classes/Inputs/ControlInput.cpp

@@ -329 +329 @@
         if(input->ObjectEnum()!=TransientInputEnum)_error_("cannot have timeoffset argument if not TransientInput Control");
         TransientInput* transient_input = xDynamicCast<TransientInput*>(input);
         IssmDouble time = transient_input->GetTimeByOffset(timeoffset);
-        TransientInput* new_trans_input = new TransientInput(ControlInputValuesEnum);
+        TransientInput* new_trans_input = new TransientInput(this->enum_type);
         for(int i=0;i<transient_input->numtimesteps;i++){
                 if(transient_input->timesteps[i]==time) new_trans_input->AddTimeInput(xDynamicCast<TriaInput*>(in_input),time);
                 else {

../trunk-jpl/src/c/shared/io/Marshalling/IoCodeConversions.cpp

@@ -142 +142 @@
                 input_enum        = CalvingStressThresholdGroundediceEnum;
                 fieldname=xNew<char>((strlen(field)+1)); xMemCpy<char>(fieldname,field,(strlen(field)+1));
         }
+        else if(strcmp(string_in,"DamageDbar")==0){
+                const char* field = "md.damage.D";
+                input_enum        = DamageDbarEnum;
+                fieldname=xNew<char>((strlen(field)+1)); xMemCpy<char>(fieldname,field,(strlen(field)+1));
+        }
         else{
                 _error_("Field \""<<string_in<<"\" not supported yet");
         }