Changeset 1210

Timestamp:

07/02/09 07:33:54 (16 years ago)

Author:

Mathieu Morlighem

Message:

do not extrude gradient if control_type='drag'

Location:

issm/trunk/src

Files:

• c/ModelProcessorx/Control/CreateParametersControl.cpp (modified) (1 diff)
• c/parallel/GradJCompute.cpp (modified) (3 diffs)
• m/solutions/cielo/GradJCompute.m (modified) (2 diffs)

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

@@ -46 +46 @@
         param= new Param(count,"control_type",STRING);
         param->SetString(model->control_type);
+        parameters->AddObject(param);
+
+        /*extrude_param: */
+        count++;
+        param= new Param(count,"extrude_param",DOUBLE);
+        if (strcmp(model->control_type,"drag")==0)   param->SetDouble(0);
+        else if (strcmp(model->control_type,"B")==0) param->SetDouble(1);
+        else throw ErrorException(__FUNCT__,exprintf("control_type %s not supported yet!",model->control_type));
         parameters->AddObject(param);
 

issm/trunk/src/c/parallel/GradJCompute.cpp

@@ -45 +45 @@
         int debug=0;
         int dim=-1;
+        int extrude_param=0;
         
         /*some parameters:*/
@@ -53 +54 @@
         femmodel->parameters->FindParam((void*)&solverstring,"solverstring");
         femmodel->parameters->FindParam((void*)&control_type,"control_type");
+        femmodel->parameters->FindParam((void*)&extrude_param,"extrude_param");
         femmodel->parameters->FindParam((void*)&debug,"debug");
         femmodel->parameters->FindParam((void*)&dim,"dim");
@@ -83 +85 @@
                                 inputs,analysis_type,sub_analysis_type,control_type);
 
-        if (dim==3){
+        if (dim==3 && extrude_param){
 
                 _printf_("%s\n","      extruding gradient...");

issm/trunk/src/m/solutions/cielo/GradJCompute.m

@@ -4 +4 @@
 debug=m.parameters.debug;
 dim=m.parameters.dim;
+extrude_param=m.parameters.extrude_param;
 ishutter=m.parameters.ishutter;
 ismacayealpattyn=m.parameters.ismacayealpattyn;
@@ -31 +32 @@
 grad_g=Gradj(m.elements,m.nodes,m.loads,m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
 
-if dim==3,
+if (dim==3 & extrude_param),
         displaystring(debug,'%s','          extruding gradient...');
         grad_g=FieldExtrude(m.elements,m.nodes,m.loads,m.materials,grad_g,'gradj',0);