Changeset 21819

Timestamp:

07/19/17 12:47:56 (8 years ago)

Author:

schlegel

Message:

CHG: add output definitions as options for Responsex

Location:

issm/trunk-jpl/src

Files:

• c/classes/FemModel.cpp (modified) (2 diffs)
• m/classes/model.m (modified) (1 diff)

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

@@ -1736 +1736 @@
                 else{
                         /*last chance for the output definition, if the enum is one of Outputdefinition[1-10]Enum:*/
-                        if(output_enum>=Outputdefinition1Enum && output_enum <=Outputdefinition10Enum){
+                        if(output_enum>=Outputdefinition1Enum && output_enum <=Outputdefinition100Enum){
                                 double_result = OutputDefinitionsResponsex(this,output_enum);
                                 if(save_results){
@@ -2032 +2032 @@
                 case VelEnum:                      this->ElementResponsex(responses,VelEnum); break;
                 case FrictionCoefficientEnum:      NodalValuex(responses, FrictionCoefficientEnum,elements,nodes, vertices, loads, materials, parameters); break;
-                default: _error_("response descriptor \"" << EnumToStringx(response_descriptor_enum) << "\" not supported yet!"); break; 
+                default: 
+                        if(response_descriptor_enum>=Outputdefinition1Enum && response_descriptor_enum <=Outputdefinition100Enum){
+                                IssmDouble double_result = OutputDefinitionsResponsex(this,response_descriptor_enum);
+                                *responses=double_result;
+                        }
+                        else _error_("response descriptor \"" << EnumToStringx(response_descriptor_enum) << "\" not supported yet!"); 
+                        break; 
         }
 

issm/trunk-jpl/src/m/classes/model.m

@@ -181 +181 @@
                         if isa(md.friction,'friction'),
                                 md.friction.coefficient=project2d(md,md.friction.coefficient,1);
+                                md.friction.p=project2d(md,md.friction.p,1);
+                                md.friction.q=project2d(md,md.friction.q,1);
+                        elseif isa(md.friction,'frictioncoulomb'),
+                                md.friction.coefficient=project2d(md,md.friction.coefficient,1);
+                                md.friction.coefficientcoulomb=project2d(md,md.friction.coefficientcoulomb,1);
                                 md.friction.p=project2d(md,md.friction.p,1);
                                 md.friction.q=project2d(md,md.friction.q,1);