Changeset 4934


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp

    r4351 r4934  
    3131                else  if (strcmp(iomodel->control_type,"rheology_B")==0){
    3232                        parameters->AddObject(new BoolParam(ExtrudeParamEnum,true));
    33                         parameters->AddObject(new IntParam(ControlTypeEnum,RheologyBEnum));
     33                        parameters->AddObject(new IntParam(ControlTypeEnum,RheologyB2dEnum));
    3434                }
    3535                else
  • issm/trunk/src/c/objects/Elements/Tria.cpp

    r4931 r4934  
    627627                        }
    628628                }
    629                 else if (control_type==RheologyBEnum){
     629                else if (control_type==RheologyB2dEnum){
    630630                        inputs->GetParameterDerivativeValue(&dB[0], &xyz_list[0][0], &gauss_l1l2l3[0],RheologyB2dEnum);
    631631                        Jelem+=cm_noisedmp*1/2*(pow(dB[0],2)+pow(dB[1],2))*Jdet*gauss_weight;
Note: See TracChangeset for help on using the changeset viewer.