Changeset 9113

Timestamp:

07/26/11 07:50:37 (14 years ago)

Author:

Eric.Larour

Message:

Fixed bug in nightly runs, dealing with requested_outputs, which were 0 sized in case
user did not request any.

Location:

issm/trunk/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (1 diff)
• c/objects/Elements/Penta.cpp (modified) (3 diffs)
• m/classes/model.m (modified) (1 diff)
• m/enum/NumRequestedOutputsEnum.m (added)

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

@@ -544 +544 @@
         MaxSteadystateIterationsEnum,
         RequestedOutputsEnum,
+        NumRequestedOutputsEnum,
         BasalFrictionEnum,
         ViscousHeatingEnum

issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -485 +485 @@
                 case MaxSteadystateIterationsEnum : return "MaxSteadystateIterations";
                 case RequestedOutputsEnum : return "RequestedOutputs";
+                case NumRequestedOutputsEnum : return "NumRequestedOutputs";
                 case BasalFrictionEnum : return "BasalFriction";
                 case ViscousHeatingEnum : return "ViscousHeating";

issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -84 +84 @@
         /*Requested output?*/
         IoModelFetchData(&requestedoutputs,&numoutputs,NULL,iomodel_handle,RequestedOutputsEnum);
-        parameters->AddObject(new IntVecParam(RequestedOutputsEnum,requestedoutputs,numoutputs));
+        parameters->AddObject(new IntParam(NumRequestedOutputsEnum,numoutputs));
+        if(numoutputs)parameters->AddObject(new IntVecParam(RequestedOutputsEnum,requestedoutputs,numoutputs));
         xfree((void**)&requestedoutputs);
         

issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -483 +483 @@
         else if (strcmp(name,"MaxSteadystateIterations")==0) return MaxSteadystateIterationsEnum;
         else if (strcmp(name,"RequestedOutputs")==0) return RequestedOutputsEnum;
+        else if (strcmp(name,"NumRequestedOutputs")==0) return NumRequestedOutputsEnum;
         else if (strcmp(name,"BasalFriction")==0) return BasalFrictionEnum;
         else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum;

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

@@ -7725 +7725 @@
         double epsilon[6];
         double     viscousheating[NUMVERTICES]={0,0,0,0,0,0};
+        double     thickness;
         GaussPenta *gauss=NULL;
 
@@ -7735 +7736 @@
         Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input);
         Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input);
+        Input* thickness_input=inputs->GetInput(ThicknessEnum); _assert_(thickness_input);
 
         /*loop over vertices: */
@@ -7740 +7742 @@
         for (int iv=0;iv<NUMVERTICES;iv++){
                 gauss->GaussVertex(iv);
+                
+                thickness_input->GetParameterValue(&thickness,gauss);
 
                 this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input);
                 matice->GetViscosity3dStokes(&viscosity,&epsilon[0]);
                 GetPhi(&phi, &epsilon[0], viscosity);
-
-                viscousheating[iv]=phi;
+                
+
+                viscousheating[iv]=phi*thickness;
         }
 

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

@@ -236 +236 @@
                  num_cm_responses                    = {0,true,'Integer'};
                  %Output
-                 requested_outputs                    = {{},true,'DoubleMat',3};
+                 requested_outputs                    = {[],true,'DoubleMat',3};
                  viscousheating                      = {NaN,false};
                  pressure_elem                       = {NaN,false};