Changeset 4569

Timestamp:

07/13/10 17:54:27 (15 years ago)

Author:

Eric.Larour

Message:

Final debugging of qmu.
InputUpdateFromDakotax: some more debug messages.
Matpar, Tria, Penta: update of Drag and other properties.
testsgetfields: needed update for qmu
postsolveparallel: added catch for errlog when it is too big.

Location:

issm/trunk/src

Files:

• c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp (modified) (2 diffs)
• c/objects/Elements/Penta.cpp (modified) (1 diff)
• c/objects/Elements/Tria.cpp (modified) (2 diffs)
• c/objects/Materials/Matpar.cpp (modified) (1 diff)
• m/classes/public/postsolveparallel.m (modified) (1 diff)
• m/solutions/SpawnCore.m (modified) (1 diff)
• m/utils/Nightly/testsgetfields.m (modified) (1 diff)

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

@@ -83 +83 @@
 
                         #ifdef _ISSM_DEBUG_
-                                PetscSynchronizedPrintf(MPI_COMM_WORLD,"Parameter vetor:");
+                                PetscSynchronizedPrintf(MPI_COMM_WORLD,"Parameter vector:");
                                 PetscSynchronizedFlush(MPI_COMM_WORLD);
                                 for(k=0;k<numberofvertices;k++){
@@ -89 +89 @@
                                         PetscSynchronizedFlush(MPI_COMM_WORLD);
                                 }
+                                PetscSynchronizedPrintf(MPI_COMM_WORLD," enum: %i\n",StringAsEnum(root));
+                                PetscSynchronizedFlush(MPI_COMM_WORLD);
                         #endif
                           

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

@@ -2782 +2782 @@
                                 name==RheologyBEnum ||
                                 name==RheologyNEnum ||
+                                name==FitEnum ||
+                                name==DragCoefficientEnum ||
                                 name==GradientEnum ||
-                                name==OldGradientEnum ||
-                                name==FitEnum
+                                name==OldGradientEnum 
                                 ) {
                 return true;

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

@@ -410 +410 @@
                 case VertexEnum:
 
-                        /*New PentaVertexInpu*/
+                        /*New TriaVertexInput*/
                         double values[3];
 
@@ -5924 +5924 @@
                                 name==RheologyBEnum ||
                                 name==RheologyNEnum ||
+                                name==FitEnum ||
+                                name==DragCoefficientEnum ||
                                 name==GradientEnum ||
                                 name==OldGradientEnum ||
-                                name==FitEnum
                 ){
                 return true;

issm/trunk/src/c/objects/Materials/Matpar.cpp

@@ -240 +240 @@
                 case RhoIceEnum:
                         this->rho_ice=constant;
+                        break;
 
                 case  RhoWaterEnum:
                         this->rho_water=constant;
+                        break;
 
                 case  HeatCapacityEnum:
                         this->heatcapacity=constant;
+                        break;
 
                 case  ThermalConductivityEnum:
                         this->thermalconductivity=constant;
+                        break;
 
                 case  LatentHeatEnum:
                         this->latentheat=constant;
+                        break;
 
                 case  BetaEnum:
                         this->beta=constant;
+                        break;
 
                 case  MeltingPointEnum:
                         this->meltingpoint=constant;
+                        break;
 
                 case  MixedLayerCapacityEnum:
                         this->mixed_layer_capacity=constant;
+                        break;
 
                 case  ThermalExchangeVelocityEnum:
                         this->thermalconductivity=constant;
+                        break;
 
                 case  GravityEnum:
                         this->g=constant;
+                        break;
 
                 default: 

issm/trunk/src/m/classes/public/postsolveparallel.m

@@ -26 +26 @@
 
         %reread onto md.errlog
-        md.errlog=char(textread([md.name '.errlog'],'%s','delimiter','\n'));
+        try,
+                md.errlog=char(textread([md.name '.errlog'],'%s','delimiter','\n','bufsize',1000000));
+        catch me,
+                disp('postsolveparallel: captured textread error, errlog is too large to read!');
+                md.errlog=''; %too big to read
+        end
         md.memoryleaks=memoryleaks;
 

issm/trunk/src/m/solutions/SpawnCore.m

@@ -23 +23 @@
 %now process the results to get response function values
 responses=DakotaResponses(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,responsedescriptors);
-
-format long 
-responses

issm/trunk/src/m/utils/Nightly/testsgetfields.m

@@ -37 +37 @@
                 field_values={vel,j,parameter};
         elseif qmu,
-                fields={'dakota.importancefactors'};
+                field_names={'dakota.importancefactors'};
+                field_values={md.results.dakota.importancefactors};
         else
                 if md.dim==3