Changeset 4934

Timestamp:

08/02/10 15:08:42 (15 years ago)

Author:

Mathieu Morlighem

Message:

control_parameter is RheologyB2d for now

Location:

issm/trunk/src/c

Files:

• modules/ModelProcessorx/Control/CreateParametersControl.cpp (modified) (1 diff)
• objects/Elements/Tria.cpp (modified) (1 diff)

issm/trunk/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp

@@ -31 +31 @@
                 else  if (strcmp(iomodel->control_type,"rheology_B")==0){
                         parameters->AddObject(new BoolParam(ExtrudeParamEnum,true));
-                        parameters->AddObject(new IntParam(ControlTypeEnum,RheologyBEnum));
+                        parameters->AddObject(new IntParam(ControlTypeEnum,RheologyB2dEnum));
                 }
                 else

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

@@ -627 +627 @@
                         }
                 }
-                else if (control_type==RheologyBEnum){
+                else if (control_type==RheologyB2dEnum){
                         inputs->GetParameterDerivativeValue(&dB[0], &xyz_list[0][0], &gauss_l1l2l3[0],RheologyB2dEnum);
                         Jelem+=cm_noisedmp*1/2*(pow(dB[0],2)+pow(dB[1],2))*Jdet*gauss_weight;