Index: /issm/trunk/src/c/ModelProcessorx/Qmu/CreateParametersQmu.cpp =================================================================== --- /issm/trunk/src/c/ModelProcessorx/Qmu/CreateParametersQmu.cpp (revision 1835) +++ /issm/trunk/src/c/ModelProcessorx/Qmu/CreateParametersQmu.cpp (revision 1836) @@ -13,7 +13,7 @@ #include "../../include/macros.h" #include "../../MeshPartitionx/MeshPartitionx.h" -#include "../Model.h" - -void CreateParametersQmu(DataSet** pparameters,Model* model,ConstDataHandle model_handle){ +#include "../IoModel.h" + +void CreateParametersQmu(DataSet** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle){ int i; @@ -52,12 +52,12 @@ count++; param= new Param(count,"qmu_analysis",INTEGER); - param->SetInteger(model->qmu_analysis); + param->SetInteger(iomodel->qmu_analysis); parameters->AddObject(param); - if(model->qmu_analysis){ + if(iomodel->qmu_analysis){ //name of qmu input, error and output files - qmuinname=(char*)xmalloc((strlen(model->name)+strlen(".qmu.in")+1)*sizeof(char)); - sprintf(qmuinname,"%s%s",model->name,".qmu.in"); + qmuinname=(char*)xmalloc((strlen(iomodel->name)+strlen(".qmu.in")+1)*sizeof(char)); + sprintf(qmuinname,"%s%s",iomodel->name,".qmu.in"); count++; @@ -66,6 +66,6 @@ parameters->AddObject(param); - qmuoutname=(char*)xmalloc((strlen(model->name)+strlen(".qmu.out")+1)*sizeof(char)); - sprintf(qmuoutname,"%s%s",model->name,".qmu.out"); + qmuoutname=(char*)xmalloc((strlen(iomodel->name)+strlen(".qmu.out")+1)*sizeof(char)); + sprintf(qmuoutname,"%s%s",iomodel->name,".qmu.out"); count++; @@ -74,6 +74,6 @@ parameters->AddObject(param); - qmuerrname=(char*)xmalloc((strlen(model->name)+strlen(".qmu.err")+1)*sizeof(char)); - sprintf(qmuerrname,"%s%s",model->name,".qmu.err"); + qmuerrname=(char*)xmalloc((strlen(iomodel->name)+strlen(".qmu.err")+1)*sizeof(char)); + sprintf(qmuerrname,"%s%s",iomodel->name,".qmu.err"); count++; @@ -85,9 +85,9 @@ count++; param= new Param(count,"qmu_npart",INTEGER); - param->SetInteger(model->qmu_npart); - parameters->AddObject(param); - - /*Deal with variables for qmu modeling: */ - variabledescriptors=(char**)xmalloc(model->numberofvariables*sizeof(char*)); + param->SetInteger(iomodel->qmu_npart); + parameters->AddObject(param); + + /*Deal with variables for qmu iomodeling: */ + variabledescriptors=(char**)xmalloc(iomodel->numberofvariables*sizeof(char*)); /*Fetch descriptors: logic varies if we are running parallel or serial. In parallel, qmumarshall @@ -96,6 +96,6 @@ #ifdef _SERIAL_ - pfield=mxGetField(model_handle,0,"variabledescriptors"); - for(i=0;inumberofvariables;i++){ + pfield=mxGetField(iomodel_handle,0,"variabledescriptors"); + for(i=0;inumberofvariables;i++){ pfield2=mxGetCell(pfield,i); FetchData((void**)&descriptor,NULL,NULL,pfield2,"String",NULL); @@ -104,7 +104,7 @@ #else tag=(char*)xmalloc((strlen("variabledescriptori")+1)*sizeof(char)); - for(i=0;inumberofvariables;i++){ + for(i=0;inumberofvariables;i++){ sprintf(tag,"%s%i","variabledescriptor",i); - ModelFetchData((void**)&descriptor,NULL,NULL,model_handle,tag,"String",NULL); + IoModelFetchData((void**)&descriptor,NULL,NULL,iomodel_handle,tag,"String",NULL); variabledescriptors[i]=descriptor; } @@ -114,15 +114,15 @@ count++; param= new Param(count,"variabledescriptors",STRINGARRAY); - param->SetStringArray(variabledescriptors,model->numberofvariables); - parameters->AddObject(param); - - - /*Deal with responses and partition for qmu modeling: */ - responsedescriptors=(char**)xmalloc(model->numberofresponses*sizeof(char*)); + param->SetStringArray(variabledescriptors,iomodel->numberofvariables); + parameters->AddObject(param); + + + /*Deal with responses and partition for qmu iomodeling: */ + responsedescriptors=(char**)xmalloc(iomodel->numberofresponses*sizeof(char*)); /*Fetch descriptors: */ #ifdef _SERIAL_ - pfield=mxGetField(model_handle,0,"responsedescriptors"); - for(i=0;inumberofresponses;i++){ + pfield=mxGetField(iomodel_handle,0,"responsedescriptors"); + for(i=0;inumberofresponses;i++){ pfield2=mxGetCell(pfield,i); FetchData((void**)&descriptor,NULL,NULL,pfield2,"String",NULL); @@ -133,7 +133,7 @@ tag=(char*)xmalloc((strlen("responsedescriptori")+1)*sizeof(char)); - for(i=0;inumberofresponses;i++){ + for(i=0;inumberofresponses;i++){ sprintf(tag,"%s%i","responsedescriptor",i); - ModelFetchData((void**)&descriptor,NULL,NULL,model_handle,tag,"String",NULL); + IoModelFetchData((void**)&descriptor,NULL,NULL,iomodel_handle,tag,"String",NULL); responsedescriptors[i]=descriptor; } @@ -143,44 +143,44 @@ count++; param= new Param(count,"responsedescriptors",STRINGARRAY); - param->SetStringArray(responsedescriptors,model->numberofresponses); + param->SetStringArray(responsedescriptors,iomodel->numberofresponses); parameters->AddObject(param); #ifdef _DEBUG_ - for(i=0;inumberofvariables;i++){ + for(i=0;inumberofvariables;i++){ _printf_("variable descriptor %s\n",variabledescriptors[i]); } - for(i=0;inumberofresponses;i++){ + for(i=0;inumberofresponses;i++){ _printf_("response descriptor %s\n",responsedescriptors[i]); } #endif - /*partition grids in model->qmu_npart parts, unless a partition is already present: */ - ModelFetchData((void**)&dpart,NULL,NULL,model_handle,"part","Matrix","Mat"); + /*partition grids in iomodel->qmu_npart parts, unless a partition is already present: */ + IoModelFetchData((void**)&dpart,NULL,NULL,iomodel_handle,"part","Matrix","Mat"); if(!dpart){ - if(strcmp(model->meshtype,"2d")==0){ - ModelFetchData((void**)&model->elements,NULL,NULL,model_handle,"elements","Matrix","Mat"); + if(strcmp(iomodel->meshtype,"2d")==0){ + IoModelFetchData((void**)&iomodel->elements,NULL,NULL,iomodel_handle,"elements","Matrix","Mat"); elements_width=3; //tria elements } else{ - ModelFetchData((void**)&model->elements2d,NULL,NULL,model_handle,"elements2d","Matrix","Mat"); + IoModelFetchData((void**)&iomodel->elements2d,NULL,NULL,iomodel_handle,"elements2d","Matrix","Mat"); elements_width=6; //penta elements } - MeshPartitionx(&epart, &part,model->numberofelements,model->numberofnodes,model->elements, model->numberofelements2d,model->numberofnodes2d,model->elements2d,model->numlayers,elements_width, model->meshtype,model->qmu_npart); - - dpart=(double*)xmalloc(model->numberofnodes*sizeof(double)); - for(i=0;inumberofnodes;i++)dpart[i]=part[i]; + MeshPartitionx(&epart, &part,iomodel->numberofelements,iomodel->numberofnodes,iomodel->elements, iomodel->numberofelements2d,iomodel->numberofnodes2d,iomodel->elements2d,iomodel->numlayers,elements_width, iomodel->meshtype,iomodel->qmu_npart); + + dpart=(double*)xmalloc(iomodel->numberofnodes*sizeof(double)); + for(i=0;inumberofnodes;i++)dpart[i]=part[i]; } count++; param= new Param(count,"qmu_part",DOUBLEVEC); - param->SetDoubleVec(dpart,model->numberofnodes,1); + param->SetDoubleVec(dpart,iomodel->numberofnodes,1); parameters->AddObject(param); /*Ok, now if any of the variables input from Dakota are distributed, we are going to need the parameters: */ - for(i=0;inumberofvariables;i++){ + for(i=0;inumberofvariables;i++){ descriptor=variabledescriptors[i]; @@ -191,10 +191,10 @@ //Fetch data: - ModelFetchData((void**)&dakota_parameter,NULL,NULL,model_handle,descriptor,"Matrix","Mat"); + IoModelFetchData((void**)&dakota_parameter,NULL,NULL,iomodel_handle,descriptor,"Matrix","Mat"); //Add parameter count++; param= new Param(count,descriptor,DOUBLEVEC); - param->SetDoubleVec(dakota_parameter,model->numberofnodes,1); + param->SetDoubleVec(dakota_parameter,iomodel->numberofnodes,1); parameters->AddObject(param); @@ -207,5 +207,5 @@ /*Free data: */ xfree((void**)&tag); - for(i=0;inumberofresponses;i++){ + for(i=0;inumberofresponses;i++){ char* descriptor=responsedescriptors[i]; xfree((void**)&descriptor); @@ -213,5 +213,5 @@ xfree((void**)&responsedescriptors); - for(i=0;inumberofvariables;i++){ + for(i=0;inumberofvariables;i++){ char* descriptor=variabledescriptors[i]; xfree((void**)&descriptor); @@ -219,6 +219,6 @@ xfree((void**)&variabledescriptors); - xfree((void**)&model->elements); - xfree((void**)&model->elements2d); + xfree((void**)&iomodel->elements); + xfree((void**)&iomodel->elements2d); xfree((void**)&epart); xfree((void**)&part);