Index: /issm/trunk/src/c/DataSet/DataSet.cpp =================================================================== --- /issm/trunk/src/c/DataSet/DataSet.cpp (revision 658) +++ /issm/trunk/src/c/DataSet/DataSet.cpp (revision 659) @@ -317,4 +317,36 @@ } +int DataSet::FindResult(void* pvalue, char* name){ + + /*Go through a dataset, and find a Result* object + *which field name is "name" : */ + + vector::iterator object; + Result* result=NULL; + + int found=0; + + for ( object=objects.begin() ; object < objects.end(); object++ ){ + + /*Find param type objects: */ + if((*object)->Enum()==ResultEnum()){ + + /*Ok, this object is a result, recover it and ask which name it has: */ + result=(Result*)(*object); + + if (strcmp(result->GetFieldName(),name)==0){ + /*Ok, this is the one! Recover the value of this result: */ + double** field=NULL; + field=(double**)pvalue; //not very safe, but hey! + result->GetField(field); + found=1; + break; + } + } + } + return found; +} + + Object* DataSet::FindParamObject(char* name){ Index: /issm/trunk/src/c/DataSet/DataSet.h =================================================================== --- /issm/trunk/src/c/DataSet/DataSet.h (revision 658) +++ /issm/trunk/src/c/DataSet/DataSet.h (revision 659) @@ -81,4 +81,5 @@ int DeleteObject(Object* object); void ComputePressure(Vec p_g); + int FindResult(void* pvalue, char* name); }; Index: /issm/trunk/src/c/parallel/DakotaResponses.cpp =================================================================== --- /issm/trunk/src/c/parallel/DakotaResponses.cpp (revision 658) +++ /issm/trunk/src/c/parallel/DakotaResponses.cpp (revision 659) @@ -14,8 +14,20 @@ #undef __FUNCT__ #define __FUNCT__ "DakotaResponses" -void DakotaResponses(double* responses,char** responses_descriptors,int numresponses,DataSet* results,int analysis_type,int sub_analysis_type){ +void DakotaResponses(double* responses,char** responses_descriptors,int numresponses,FemModel* femmodels,DataSet* results,int analysis_type,int sub_analysis_type){ - int i; + int i,j; + int found=0; char* response_descriptor=NULL; + int numberofnodes; + FemModel* fem=NULL; + extern int my_rank; + + /*recover first model: */ + fem=femmodels; + + /*some data needed across the responses: */ + found=fem->parameters->FindParam((void*)&numberofnodes,"numberofnodes"); + if(!found)throw ErrorException(__FUNCT__," could not find numberofnodes in fem model"); + for(i=0;iFindResult((void*)&vel,"vel"); + if(!found)throw ErrorException(__FUNCT__," could not find vel to compute min_vel"); + min_vel=vel[0]; + for(j=1;jFindResult((void*)&vel,"vel"); + if(!found)throw ErrorException(__FUNCT__," could not find vel to compute max_vel"); + + max_vel=vel[0]; + for(j=1;jmax_vel)max_vel=vel[j]; + } + if(my_rank==0)responses[i]=max_vel; + } + else if(strcmp(response_descriptor,"min_vx")==0){ + double* vx=NULL; + double min_vx=0; + + found=results->FindResult((void*)&vx,"vx"); + if(!found)throw ErrorException(__FUNCT__," could not find vx to compute min_vx"); + + min_vx=vx[0]; + for(j=1;jFindResult((void*)&vx,"vx"); + if(!found)throw ErrorException(__FUNCT__," could not find vx to compute max_vx"); + + max_vx=vx[0]; + for(j=1;jmax_vx)max_vx=vx[j]; + } + if(my_rank==0)responses[i]=max_vx; + } + else if(strcmp(response_descriptor,"max_abs_vx")==0){ + double* vx=NULL; + double max_abs_vx=0; + + found=results->FindResult((void*)&vx,"vx"); + if(!found)throw ErrorException(__FUNCT__," could not find vx to compute max_abs_vx"); + + max_abs_vx=fabs(vx[0]); + for(j=1;jmax_abs_vx)max_abs_vx=fabs(vx[j]); + } + if(my_rank==0)responses[i]=max_abs_vx; + } + else if(strcmp(response_descriptor,"min_vy")==0){ + double* vy=NULL; + double min_vy=0; + + found=results->FindResult((void*)&vy,"vy"); + if(!found)throw ErrorException(__FUNCT__," could not find vy to compute min_vy"); + + min_vy=vy[0]; + for(j=1;jFindResult((void*)&vy,"vy"); + if(!found)throw ErrorException(__FUNCT__," could not find vy to compute max_vy"); + + max_vy=vy[0]; + for(j=1;jmax_vy)max_vy=vy[j]; + } + if(my_rank==0)responses[i]=max_vy; + } + else if(strcmp(response_descriptor,"max_abs_vy")==0){ + double* vy=NULL; + double max_abs_vy=0; + + found=results->FindResult((void*)&vy,"vy"); + if(!found)throw ErrorException(__FUNCT__," could not find vy to compute max_abs_vy"); + + max_abs_vy=fabs(vy[0]); + for(j=1;jmax_abs_vy)max_abs_vy=fabs(vy[j]); + } + if(my_rank==0)responses[i]=max_abs_vy; + } + else if(strcmp(response_descriptor,"min_vz")==0){ + double* vz=NULL; + double min_vz=0; + + found=results->FindResult((void*)&vz,"vz"); + if(!found)throw ErrorException(__FUNCT__," could not find vz to compute min_vz"); + + min_vz=vz[0]; + for(j=1;jFindResult((void*)&vz,"vz"); + if(!found)throw ErrorException(__FUNCT__," could not find vz to compute max_vz"); + + max_vz=vz[0]; + for(j=1;jmax_vz)max_vz=vz[j]; + } + if(my_rank==0)responses[i]=max_vz; + } + else if(strcmp(response_descriptor,"max_abs_vz")==0){ + double* vz=NULL; + double max_abs_vz=0; + + found=results->FindResult((void*)&vz,"vz"); + if(!found)throw ErrorException(__FUNCT__," could not find vz to compute max_abs_vz"); + + max_abs_vz=fabs(vz[0]); + for(j=1;jmax_abs_vz)max_abs_vz=fabs(vz[j]); + } + if(my_rank==0)responses[i]=max_abs_vz; } else throw ErrorException(__FUNCT__,exprintf("%s%s%s"," response descriptor : ",response_descriptor," not supported yet!")); Index: /issm/trunk/src/c/parallel/ProcessResults.cpp =================================================================== --- /issm/trunk/src/c/parallel/ProcessResults.cpp (revision 658) +++ /issm/trunk/src/c/parallel/ProcessResults.cpp (revision 659) @@ -21,9 +21,12 @@ #include "../shared/shared.h" -void ProcessResults(DataSet** pnewresults,DataSet* results,FemModel* fems,int analysis_type){ +void ProcessResults(DataSet** presults,FemModel* fems,int analysis_type){ int i,n; Result* result=NULL; Result* newresult=NULL; + + /*input: */ + DataSet* results=NULL; /*output: */ @@ -47,4 +50,5 @@ double* vy=NULL; double* vz=NULL; + double* vel=NULL; Vec p_g=NULL; double* p_g_serial=NULL; @@ -55,8 +59,10 @@ int numberofnodes; + /*recover input results: */ + results=*presults; + /*Initialize new results: */ newresults=new DataSet(ResultsEnum()); - /*Recover femmodels first: */ if(analysis_type==DiagnosticAnalysisEnum()){ @@ -101,4 +107,5 @@ vy=(double*)xmalloc(numberofnodes*sizeof(double)); vz=(double*)xmalloc(numberofnodes*sizeof(double)); + vel=(double*)xmalloc(numberofnodes*sizeof(double)); for(i=0;iAddObject(newresult); + newresult=new Result(newresults->Size()+1,result->GetTime(),result->GetStep(),"vel",vel,numberofnodes); + newresults->AddObject(newresult); + /*do some cleanup: */ xfree((void**)&u_g_serial); @@ -138,5 +152,4 @@ } else if(strcmp(result->GetFieldName(),"p_g")==0){ - /*easy, p_g is of size numberofnodes, on 1 dof, just repartition: */ result->GetField(&p_g); @@ -174,7 +187,10 @@ } + /*Delete results: */ + delete results; + + /*Assign output pointers:*/ - *pnewresults=newresults; - + *presults=newresults; } Index: /issm/trunk/src/c/parallel/SpawnCore.cpp =================================================================== --- /issm/trunk/src/c/parallel/SpawnCore.cpp (revision 658) +++ /issm/trunk/src/c/parallel/SpawnCore.cpp (revision 659) @@ -24,6 +24,5 @@ /*output from core solutions: */ - Vec u_g=NULL; - Vec p_g=NULL; + DataSet* results=NULL; char** responses_descriptors=NULL; @@ -34,5 +33,4 @@ double* qmu_part=NULL; int qmu_npart; - DataSet* results=NULL; extern int my_rank; @@ -91,4 +89,7 @@ #endif + _printf_("initialize results:\n"); + results=new DataSet(ResultsEnum()); + /*Modify core inputs to reflect the dakota variables inputs: */ //inputs->UpdateFromDakota(variables,variables_descriptors,numvariables,qmu_part,qmu_npart); @@ -105,13 +106,15 @@ } + /*Now process the outputs, before computing the dakota responses: */ + _printf_("process results:\n"); + ProcessResults(&results,femmodels,analysis_type); + /*compute responses on cpu 0: dummy for now! */ - DakotaResponses(responses,responses_descriptors,numresponses,results,analysis_type,sub_analysis_type); + _printf_("compute dakota responses:\n"); + DakotaResponses(responses,responses_descriptors,numresponses,femmodels,results,analysis_type,sub_analysis_type); /*Free ressources:*/ - - //vectors - VecFree(&u_g); - VecFree(&p_g); - + delete results; + //variables only on cpu != 0 if(my_rank!=0){ Index: /issm/trunk/src/c/parallel/diagnostic.cpp =================================================================== --- /issm/trunk/src/c/parallel/diagnostic.cpp (revision 658) +++ /issm/trunk/src/c/parallel/diagnostic.cpp (revision 659) @@ -23,5 +23,7 @@ char* outputfilename=NULL; char* lockname=NULL; - char* qmuname=NULL; + char* qmuinname=NULL; + char* qmuoutname=NULL; + char* qmuerrname=NULL; int numberofnodes; int qmu_analysis=0; @@ -32,5 +34,4 @@ /*Results: */ DataSet* results=NULL; - DataSet* newresults=NULL; ParameterInputs* inputs=NULL; @@ -56,5 +57,7 @@ outputfilename=argv[3]; lockname=argv[4]; - qmuname=argv[5]; + qmuinname=argv[5]; + qmuoutname=argv[6]; + qmuerrname=argv[7]; /*Open handle to data on disk: */ @@ -101,12 +104,12 @@ _printf_("calling qmu analysis on diagnostic core:\n"); - //qmu(qmuname,&femmodels[0],inputs,DiagnosticAnalysisEnum(),NoneAnalysisEnum()); + qmu(qmuinname,qmuoutname,qmuerrname,&femmodels[0],inputs,DiagnosticAnalysisEnum(),NoneAnalysisEnum()); } _printf_("process results:\n"); - ProcessResults(&newresults,results,&femmodels[0],DiagnosticAnalysisEnum()); delete results; + ProcessResults(&results,&femmodels[0],DiagnosticAnalysisEnum()); _printf_("write results to disk:\n"); - OutputResults(newresults,outputfilename); + OutputResults(results,outputfilename); _printf_("write lock file:\n"); @@ -117,8 +120,6 @@ _printf_("closing MPI and Petsc\n"); - MPI_Barrier(MPI_COMM_WORLD); - - /*Close MPI libraries: */ PetscFinalize(); + /*end module: */ Index: /issm/trunk/src/c/parallel/parallel.h =================================================================== --- /issm/trunk/src/c/parallel/parallel.h (revision 658) +++ /issm/trunk/src/c/parallel/parallel.h (revision 659) @@ -36,8 +36,8 @@ void CreateFemModel(FemModel* femmodel,ConstDataHandle MODEL,char* analysis_type,char* sub_analysis_type); //int BatchDebug(Mat* Kgg,Vec* pg,FemModel* femmodel,char* filename); -void qmu(const char* dakota_input_file,FemModel* femmodels,ParameterInputs* inputs,int analysis_type,int sub_analysis_type); +void qmu(const char* dakota_input_file,const char* dakota_output_file,const char* dakota_error_file,FemModel* femmodels,ParameterInputs* inputs,int analysis_type,int sub_analysis_type); void SpawnCore(double* responses,double* variables,char** variable_descriptors,int numvariables, FemModel* femmodels,ParameterInputs* inputs,int analysis_type,int sub_analysis_type); -void DakotaResponses(double* responses,char** responses_descriptors,int numresponses,DataSet* results,int analysis_type,int sub_analysis_type); -void ProcessResults(DataSet** pnewresults,DataSet* results,FemModel* fems,int analysis_type); +void DakotaResponses(double* responses,char** responses_descriptors,int numresponses,FemModel* femmodels, DataSet* results,int analysis_type,int sub_analysis_type); +void ProcessResults(DataSet** presults,FemModel* fems,int analysis_type); #endif Index: /issm/trunk/src/c/parallel/qmu.cpp =================================================================== --- /issm/trunk/src/c/parallel/qmu.cpp (revision 658) +++ /issm/trunk/src/c/parallel/qmu.cpp (revision 659) @@ -23,5 +23,6 @@ #include "parallel.h" -void qmu(const char* dakota_input_file,FemModel* femmodels,ParameterInputs* inputs,int analysis_type,int sub_analysis_type){ +void qmu(const char* dakota_input_file,const char* dakota_output_file,const char* dakota_error_file, FemModel* femmodels,ParameterInputs* inputs,int analysis_type,int sub_analysis_type){ + extern int my_rank; @@ -30,5 +31,5 @@ if(my_rank==0){ - + // Instantiate/initialize the parallel library and problem description // database objects. @@ -41,5 +42,5 @@ problem_db.manage_inputs(dakota_input_file); // specify_outputs_restart() is only necessary if specifying non-defaults - //parallel_lib.specify_outputs_restart(NULL, NULL, NULL, NULL); + parallel_lib.specify_outputs_restart(dakota_output_file,dakota_error_file,NULL, NULL); // Instantiate the Strategy object (which instantiates all Model and Index: /issm/trunk/src/c/parallel/thermal.cpp =================================================================== --- /issm/trunk/src/c/parallel/thermal.cpp (revision 658) +++ /issm/trunk/src/c/parallel/thermal.cpp (revision 659) @@ -35,5 +35,4 @@ /*Results: */ DataSet* results=NULL; - DataSet* newresults=NULL; ParameterInputs* inputs=NULL; @@ -89,4 +88,5 @@ param=(Param*)femmodels[1].parameters->FindParamObject("p_g"); femmodels[1].parameters->DeleteObject((Object*)param); + _printf_("call computational core:\n"); @@ -94,8 +94,8 @@ _printf_("process results:\n"); - ProcessResults(&newresults,results,&femmodels[0],ThermalAnalysisEnum()); delete results; + ProcessResults(&results,&femmodels[0],ThermalAnalysisEnum()); _printf_("write results to disk:\n"); - OutputResults(newresults,outputfilename); + OutputResults(results,outputfilename); _printf_("write lock file:\n"); Index: /issm/trunk/src/m/classes/public/BuildQueueingScriptGeneric.m =================================================================== --- /issm/trunk/src/m/classes/public/BuildQueueingScriptGeneric.m (revision 658) +++ /issm/trunk/src/m/classes/public/BuildQueueingScriptGeneric.m (revision 659) @@ -29,4 +29,4 @@ end -fprintf(fid,' %s %s.bin %s.outbin %s.lock qmu.in 2> %s.errlog >%s.outlog & ',executionpath,md.name,md.name,md.name,md.name,md.name); +fprintf(fid,' %s %s.bin %s.outbin %s.lock %s.qmu.in %s.qmu.out %s.qmu.err 2> %s.errlog >%s.outlog & ',executionpath,md.name,md.name,md.name,md.name,md.name,md.name,md.name,md.name); fclose(fid); Index: /issm/trunk/src/m/classes/public/LaunchQueueJobGeneric.m =================================================================== --- /issm/trunk/src/m/classes/public/LaunchQueueJobGeneric.m (revision 658) +++ /issm/trunk/src/m/classes/public/LaunchQueueJobGeneric.m (revision 659) @@ -21,5 +21,5 @@ if strcmpi(hostname,md.cluster), if md.qmu_analysis, - system(['cp ' md.name '.bin' ' ' md.name '.queue qmu/qmu.in ' ' ' executionpath]); + system(['cp ' md.name '.bin' ' ' md.name '.queue qmu/' md.name '.qmu.in ' ' ' executionpath]); else system(['cp ' md.name '.bin' ' ' md.name '.queue' ' ' executionpath]); @@ -27,5 +27,5 @@ else if md.qmu_analysis, - system(['scp ' md.name '.bin' ' ' md.name '.queue qmu/qmu.in ' ' ' md.cluster ':' executionpath]); + system(['scp ' md.name '.bin' ' ' md.name '.queue qmu/' md.name '.qmu.in ' ' ' md.cluster ':' executionpath]); else system(['scp ' md.name '.bin' ' ' md.name '.queue' ' ' md.cluster ':' executionpath]); Index: /issm/trunk/src/m/classes/public/marshall.m =================================================================== --- /issm/trunk/src/m/classes/public/marshall.m (revision 658) +++ /issm/trunk/src/m/classes/public/marshall.m (revision 659) @@ -164,4 +164,5 @@ WriteData(fid,responses(i).descriptor,'String',['descriptor' num2str(i-1)]); end + WriteData(fid,md.npart,'Integer','npart'); end Index: /issm/trunk/src/m/solutions/dakota/dakota_in_write.m =================================================================== --- /issm/trunk/src/m/solutions/dakota/dakota_in_write.m (revision 658) +++ /issm/trunk/src/m/solutions/dakota/dakota_in_write.m (revision 659) @@ -26,5 +26,5 @@ [pathstr,name,ext,versn] = fileparts(filei); if isempty(ext) - ext='.in'; + ext='.qmu.in'; end filei2=fullfile(pathstr,[name ext versn]); Index: /issm/trunk/src/m/solutions/dakota/qmuin.m =================================================================== --- /issm/trunk/src/m/solutions/dakota/qmuin.m (revision 658) +++ /issm/trunk/src/m/solutions/dakota/qmuin.m (revision 659) @@ -8,5 +8,5 @@ qmudir ='qmu'; % qmufile can not be changed unless cielo_ice_script.sh is also changed -qmufile='qmu'; +qmufile=md.name; ivar =1; iresp =1; @@ -75,7 +75,9 @@ md.qmu_params(iparams).analysis_driver=[ISSM_DIR '/src/m/solutions/dakota/cielo_ice_script.sh']; end + dakota_in_data(md.qmu_method(imethod),md.variables(ivar),md.responses(iresp),md.qmu_params(iparams),qmufile,package,md); -system(['rm -rf qmu.m']); + +system(['rm -rf ' md.name '.m']); cd ../