Index: /issm/trunk/externalpackages/dakota/configs/linux64/configure.sh =================================================================== --- /issm/trunk/externalpackages/dakota/configs/linux64/configure.sh (revision 4490) +++ /issm/trunk/externalpackages/dakota/configs/linux64/configure.sh (revision 4491) @@ -1,2 +1,2 @@ #!/bin/bash -./configure --prefix="$ISSM_DIR/externalpackages/dakota/install" --without-graphics --with-pic --disable-mpi +./configure --prefix="$ISSM_DIR/externalpackages/dakota/install" --without-graphics --with-pic --disable-mpi --with-blas=/usr/lib64/libblas.so.3.0.3 --with-lapack=/usr/lib64/liblapack.so.3.0.3 Index: /issm/trunk/src/c/Makefile.am =================================================================== --- /issm/trunk/src/c/Makefile.am (revision 4490) +++ /issm/trunk/src/c/Makefile.am (revision 4491) @@ -334,4 +334,5 @@ ./EnumDefinitions/EnumAsString.cpp\ ./EnumDefinitions/StringAsEnum.cpp\ + ./EnumDefinitions/EnumAsModelField.cpp\ ./modules/ModelProcessorx/ModelProcessorx.h\ ./modules/ModelProcessorx/ModelProcessorx.cpp\ @@ -883,4 +884,5 @@ ./EnumDefinitions/EnumAsString.cpp\ ./EnumDefinitions/StringAsEnum.cpp\ + ./EnumDefinitions/EnumAsModelField.cpp\ ./modules/ModelProcessorx/ModelProcessorx.h\ ./modules/ModelProcessorx/ModelProcessorx.cpp\ Index: /issm/trunk/src/c/issm.cpp =================================================================== --- /issm/trunk/src/c/issm.cpp (revision 4490) +++ /issm/trunk/src/c/issm.cpp (revision 4491) @@ -100,5 +100,5 @@ #ifdef _HAVE_DAKOTA_ MPI_Barrier(MPI_COMM_WORLD); start_core=MPI_Wtime( ); - Qmux(femmodel,DiagnosticAnalysisEnum,NoneAnalysisEnum); + Qmux(femmodel,femmodel->parameters); MPI_Barrier(MPI_COMM_WORLD); finish_core=MPI_Wtime( ); #else Index: /issm/trunk/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp =================================================================== --- /issm/trunk/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp (revision 4490) +++ /issm/trunk/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp (revision 4491) @@ -40,5 +40,5 @@ qmu_part=(double*)xmalloc(numberofvertices*sizeof(double)); for(k=0;kFindParam(¶meter_serial,NULL,NULL,StringAsEnum(root)); + if(!parameters->FindParam(¶meter_serial,NULL,StringAsEnum(root))){ + ISSMERROR("%s%s"," could not find Qmu parameter: ",root); + } /*repartition parameter: */ parameter=(double*)xmalloc(numberofvertices*sizeof(double)); for(k=0;kAddObject(new DoubleVecParam(DakotaParameterEnum,dakota_parameter,iomodel->numberofvertices)); + IoModelFetchData(&dakota_parameter,NULL,NULL,iomodel_handle,EnumAsModelField(StringAsEnum(descriptor))); + parameters->AddObject(new DoubleVecParam(StringAsEnum(descriptor),dakota_parameter,iomodel->numberofvertices)); xfree((void**)&dakota_parameter); - } } Index: /issm/trunk/src/c/objects/DakotaPlugin.cpp =================================================================== --- /issm/trunk/src/c/objects/DakotaPlugin.cpp (revision 4490) +++ /issm/trunk/src/c/objects/DakotaPlugin.cpp (revision 4491) @@ -87,5 +87,5 @@ /*run core solution: */ - SpawnCore(responses,numFns, variables,variable_descriptors,numACV,model,counter); + SpawnCore(responses,numFns, variables,variable_descriptors,numACV,femmodel,counter); /*populate responses: */ Index: /issm/trunk/src/c/objects/Elements/Penta.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 4490) +++ /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 4491) @@ -1790,4 +1790,5 @@ this->inputs->AddInput(new PentaVertexInput(VxEnum,nodeinputs)); this->inputs->AddInput(new PentaVertexInput(VxOldEnum,nodeinputs)); + if(iomodel->qmu_analysis)this->inputs->AddInput(new PentaVertexInput(QmuVxEnum,nodeinputs)); } if (iomodel->vy) { @@ -1795,4 +1796,5 @@ this->inputs->AddInput(new PentaVertexInput(VyEnum,nodeinputs)); this->inputs->AddInput(new PentaVertexInput(VyOldEnum,nodeinputs)); + if(iomodel->qmu_analysis)this->inputs->AddInput(new PentaVertexInput(QmuVyEnum,nodeinputs)); } if (iomodel->vz) { @@ -1800,4 +1802,5 @@ this->inputs->AddInput(new PentaVertexInput(VzEnum,nodeinputs)); this->inputs->AddInput(new PentaVertexInput(VzOldEnum,nodeinputs)); + if(iomodel->qmu_analysis)this->inputs->AddInput(new PentaVertexInput(QmuVzEnum,nodeinputs)); } if (iomodel->vx_obs) { @@ -1833,4 +1836,5 @@ this->inputs->AddInput(new PentaVertexInput(VxEnum,nodeinputs)); this->inputs->AddInput(new PentaVertexInput(VxOldEnum,nodeinputs)); + if(iomodel->qmu_analysis) this->inputs->AddInput(new PentaVertexInput(QmuVxEnum,nodeinputs)); } if(!iomodel->vy){ @@ -1839,4 +1843,5 @@ this->inputs->AddInput(new PentaVertexInput(VyEnum,nodeinputs)); this->inputs->AddInput(new PentaVertexInput(VyOldEnum,nodeinputs)); + if(iomodel->qmu_analysis) this->inputs->AddInput(new PentaVertexInput(QmuVyEnum,nodeinputs)); } if(!iomodel->vz){ @@ -1845,4 +1850,12 @@ this->inputs->AddInput(new PentaVertexInput(VzEnum,nodeinputs)); this->inputs->AddInput(new PentaVertexInput(VzOldEnum,nodeinputs)); + if(iomodel->qmu_analysis) this->inputs->AddInput(new PentaVertexInput(QmuVzEnum,nodeinputs)); + } + if(!iomodel->pressure){ + for(i=0;i<6;i++)nodeinputs[i]=0; + if(iomodel->qmu_analysis){ + this->inputs->AddInput(new PentaVertexInput(PressureEnum,nodeinputs)); + this->inputs->AddInput(new PentaVertexInput(QmuPressureEnum,nodeinputs)); + } } break; Index: /issm/trunk/src/c/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 4490) +++ /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 4491) @@ -2295,4 +2295,5 @@ this->inputs->AddInput(new TriaVertexInput(VxEnum,nodeinputs)); this->inputs->AddInput(new TriaVertexInput(VxOldEnum,nodeinputs)); + if(iomodel->qmu_analysis)this->inputs->AddInput(new TriaVertexInput(QmuVxEnum,nodeinputs)); } if (iomodel->vy) { @@ -2300,4 +2301,5 @@ this->inputs->AddInput(new TriaVertexInput(VyEnum,nodeinputs)); this->inputs->AddInput(new TriaVertexInput(VyOldEnum,nodeinputs)); + if(iomodel->qmu_analysis)this->inputs->AddInput(new TriaVertexInput(QmuVyEnum,nodeinputs)); } if (iomodel->vz) { @@ -2305,4 +2307,5 @@ this->inputs->AddInput(new TriaVertexInput(VzEnum,nodeinputs)); this->inputs->AddInput(new TriaVertexInput(VzOldEnum,nodeinputs)); + if(iomodel->qmu_analysis)this->inputs->AddInput(new TriaVertexInput(QmuVzEnum,nodeinputs)); } if (iomodel->vx_obs) { @@ -2338,4 +2341,5 @@ this->inputs->AddInput(new TriaVertexInput(VxEnum,nodeinputs)); this->inputs->AddInput(new TriaVertexInput(VxOldEnum,nodeinputs)); + if(iomodel->qmu_analysis) this->inputs->AddInput(new TriaVertexInput(QmuVxEnum,nodeinputs)); } if(!iomodel->vy){ @@ -2344,4 +2348,5 @@ this->inputs->AddInput(new TriaVertexInput(VyEnum,nodeinputs)); this->inputs->AddInput(new TriaVertexInput(VyOldEnum,nodeinputs)); + if(iomodel->qmu_analysis) this->inputs->AddInput(new TriaVertexInput(QmuVyEnum,nodeinputs)); } if(!iomodel->vz){ @@ -2350,4 +2355,12 @@ this->inputs->AddInput(new TriaVertexInput(VzEnum,nodeinputs)); this->inputs->AddInput(new TriaVertexInput(VzOldEnum,nodeinputs)); + if(iomodel->qmu_analysis) this->inputs->AddInput(new TriaVertexInput(QmuVzEnum,nodeinputs)); + } + if(!iomodel->pressure){ + for(i=0;i<3;i++)nodeinputs[i]=0; + if(iomodel->qmu_analysis){ + this->inputs->AddInput(new TriaVertexInput(PressureEnum,nodeinputs)); + this->inputs->AddInput(new TriaVertexInput(QmuPressureEnum,nodeinputs)); + } } break; Index: /issm/trunk/src/c/objects/Vertex.cpp =================================================================== --- /issm/trunk/src/c/objects/Vertex.cpp (revision 4490) +++ /issm/trunk/src/c/objects/Vertex.cpp (revision 4491) @@ -258,12 +258,10 @@ void Vertex::CreatePartition(Vec partition){ - int idxm; double value; - idxm=(sid-1); value=(double)this->dof; ISSMASSERT(value>=0); - VecSetValues(partition,1,&idxm,&value,INSERT_VALUES); + VecSetValues(partition,1,&sid,&value,INSERT_VALUES); return; Index: /issm/trunk/src/m/dakota/setupdesign/QmuSetupDesign.m =================================================================== --- /issm/trunk/src/m/dakota/setupdesign/QmuSetupDesign.m (revision 4490) +++ /issm/trunk/src/m/dakota/setupdesign/QmuSetupDesign.m (revision 4491) @@ -5,41 +5,41 @@ %loop on descriptor -if strcmpi(descriptor,'rho_ice') +if strcmpi(descriptor,'RhoIce') dvar=setuprhoice(dvar,variables,params,varargin{:}); -elseif strcmpi(descriptor,'rho_water') +elseif strcmpi(descriptor,'RhoWater') dvar=setuprhowater(dvar,variables,params,varargin{:}); -elseif strcmpi(descriptor,'heatcapacity') +elseif strcmpi(descriptor,'HeatCapacity') dvar=setupheatcapacity(dvar,variables,params,varargin{:}); -elseif strcmpi(descriptor,'thermalconductivity') +elseif strcmpi(descriptor,'ThermalConductivity') dvar=setupthermalconductivity(dvar,variables,params,varargin{:}); -elseif strcmpi(descriptor,'gravity') +elseif strcmpi(descriptor,'Gravity') dvar=setupgravity(dvar,variables,params,varargin{:}); -elseif strcmpi(descriptor,'thickness') +elseif strcmpi(descriptor,'Thickness') dvar=setupthickness(dvar,variables,params,varargin{:}); -elseif strcmpi(descriptor,'drag') +elseif strcmpi(descriptor,'DragCoefficient') dvar=setupdrag(dvar,variables,params,varargin{:}); -elseif strncmpi(descriptor,'drag_node',9) +elseif strncmpi(descriptor,'DragCoefficientNode',9) dvar=setupdrag_node(dvar,variables,params,varargin{:}); -elseif strncmpi(descriptor,'thickness_node',14) +elseif strncmpi(descriptor,'ThicknessNode',14) dvar=setupthickness_node(dvar,variables,params,varargin{:}); -elseif strcmpi(descriptor,'riftsfriction') +elseif strcmpi(descriptor,'RiftsFriction') dvar=setupriftsfriction(dvar,variables,params,varargin{:}); Index: /issm/trunk/src/m/solutions/SpawnCore.m =================================================================== --- /issm/trunk/src/m/solutions/SpawnCore.m (revision 4490) +++ /issm/trunk/src/m/solutions/SpawnCore.m (revision 4491) @@ -8,5 +8,5 @@ %retrieve parameters verbose=femmodel.parameters.Verbose; -responsedescriptors=femmodel.parameters.responsedescriptors; +responsedescriptors=femmodel.parameters.ResponseDescriptors; solution_type=femmodel.parameters.SolutionType; @@ -14,5 +14,5 @@ %first update the inputs to the femmodel using the variables provided to us by dakota. -[femmodel.elements femmodel.loads]=InputUpdateFromDakota(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,femmodel.partition,variables,variabledescriptors); +[femmodel.elements femmodel.loads]=InputUpdateFromDakota(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,femmodel.part,variables,variabledescriptors); %now run the core solution Index: /issm/trunk/src/mex/InputUpdateFromDakota/InputUpdateFromDakota.cpp =================================================================== --- /issm/trunk/src/mex/InputUpdateFromDakota/InputUpdateFromDakota.cpp (revision 4490) +++ /issm/trunk/src/mex/InputUpdateFromDakota/InputUpdateFromDakota.cpp (revision 4491) @@ -38,5 +38,5 @@ FetchParams(¶meters,PARAMETERSIN); FetchData(&partition,PARTITION); - + VecShift(partition,-1.0); //get partition onto "c" indexing /*dakota input: */ FetchData(&variables,&numvariables,VARIABLES); @@ -44,12 +44,12 @@ variables_descriptors=(char**)xmalloc(numvariables*sizeof(char*)); for(i=0;i