Changeset 14705

Timestamp:

04/22/13 18:01:23 (12 years ago)

Author:

Eric.Larour

Message:

CHG: adding protection for some portions of the code

File:

• issm/trunk-jpl/src/c/classes/FemModel.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -691 +691 @@
                 case MaxAbsVzEnum:               this->MaxAbsVzx(                responses,process_units); break;
                 case MassFluxEnum:               this->MassFluxx(         responses,process_units); break;
+                #ifdef _HAVE_CONTROL__
                 case SurfaceAbsVelMisfitEnum:    SurfaceAbsVelMisfitx(responses, elements,nodes, vertices, loads, materials, parameters,process_units,weight_index); break;
                 case SurfaceRelVelMisfitEnum:    SurfaceRelVelMisfitx(responses, elements,nodes, vertices, loads, materials, parameters,process_units,weight_index); break;
@@ -700 +701 @@
                 case ThicknessAlongGradientEnum: ThicknessAlongGradientx(responses, elements,nodes, vertices, loads, materials, parameters,process_units,weight_index); break;
                 case ThicknessAcrossGradientEnum:ThicknessAcrossGradientx(responses, elements,nodes, vertices, loads, materials, parameters,process_units,weight_index); break;
-                case BalancethicknessMisfitEnum:BalancethicknessMisfitx(responses,process_units,weight_index); break;
-                case TotalSmbEnum:                                      this->TotalSmbx(responses,process_units); break;
                 case RheologyBbarAbsGradientEnum:RheologyBbarAbsGradientx(responses, elements,nodes, vertices, loads, materials, parameters,process_units,weight_index); break;
                 case DragCoefficientAbsGradientEnum:DragCoefficientAbsGradientx(responses, elements,nodes, vertices, loads, materials, parameters,process_units,weight_index); break;
+                case BalancethicknessMisfitEnum:BalancethicknessMisfitx(responses,process_units,weight_index); break;
+                #endif
+                case TotalSmbEnum:                                      this->TotalSmbx(responses,process_units); break;
                 case MaterialsRheologyBbarEnum: this->ElementResponsex(responses,MaterialsRheologyBbarEnum,process_units); break;
                 case VelEnum:                   this->ElementResponsex(responses,VelEnum,process_units); break;