Changeset 3887 for issm/trunk/src/c/objects/Elements/Tria.cpp

Timestamp:

05/21/10 14:51:20 (15 years ago)

Author:

Eric.Larour

Message:

New call to cores, starting to cleanup the results API

File:

• issm/trunk/src/c/objects/Elements/Tria.cpp (modified) (6 diffs)

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -658 +658 @@
         double  dk[NDOF2]; 
         double  dB[NDOF2]; 
-        char*   control_type=NULL;
+        int    control_type;
         double  cm_noisedmp;
 
@@ -700 +700 @@
 
                 /*Add Tikhonov regularization term to misfit*/
-                if (strcmp(control_type,"drag")==0){
+                if (control_type==DragCoefficientEnum){
                         if (shelf){
                                 inputs->GetParameterDerivativeValue(&dk[0],&xyz_list[0][0],&gauss_l1l2l3[0],DragCoefficientEnum);
@@ -707 +707 @@
                         }
                 }
-                else if (strcmp(control_type,"B")==0){
+                else if (control_type==RheologyBEnum){
                         inputs->GetParameterDerivativeValue(&dB[0], &xyz_list[0][0], &gauss_l1l2l3[0],RheologyBEnum);
                         Jelem+=cm_noisedmp*1/2*(pow(dB[0],2)+pow(dB[1],2))*Jdet*gauss_weight;
                 }
                 else{
-                        ISSMERROR("%s%s","unsupported control type: ",control_type);
+                        ISSMERROR("%s%i","unsupported control type: ",control_type);
                 }
 
@@ -721 +721 @@
         xfree((void**)&third_gauss_area_coord);
         xfree((void**)&gauss_weights);
-        xfree((void**)&control_type);
 
         /*Return: */
@@ -3831 +3830 @@
 /*}}}*/
 /*FUNCTION Tria::Gradj {{{1*/
-void  Tria::Gradj(Vec grad_g,int analysis_type,int sub_analysis_type,char* control_type){
+void  Tria::Gradj(Vec grad_g,int analysis_type,int sub_analysis_type,int control_type){
 
         /*inputs: */
@@ -3842 +3841 @@
         if(onwater)return;
 
-        if (strcmp(control_type,"drag")==0){
+        if (control_type==DragCoefficientEnum){
                 GradjDrag( grad_g,analysis_type,sub_analysis_type);
         }
-        else if (strcmp(control_type,"B")==0){
+        else if (control_type==RheologyBEnum){
                 GradjB( grad_g,analysis_type,sub_analysis_type);
         }
-        else ISSMERROR("%s%s","control type not supported yet: ",control_type);
+        else ISSMERROR("%s%i","control type not supported yet: ",control_type);
 }
 /*}}}*/