Index: /issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp (revision 25760) +++ /issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp (revision 25761) @@ -12,5 +12,5 @@ #include "../InputUpdateFromConstantx/InputUpdateFromConstantx.h" #include "../InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.h" - + void InputUpdateFromDakotax(FemModel* femmodel,double* variables,char* *variables_descriptors,int numdakotavariables){ /*{{{*/ @@ -34,27 +34,27 @@ /*retrieve parameters: */ - femmodel->parameters->FindParam(&variable_partitions,&variable_partitions_num,NULL,NULL,QmuVariablePartitionsEnum); - femmodel->parameters->FindParam(&variable_partitions_npart,NULL,NULL,QmuVariablePartitionsNpartEnum); - femmodel->parameters->FindParam(&variable_partitions_nt,NULL,NULL,QmuVariablePartitionsNtEnum); - - - /*Go through all dakota descriptors, ex: "rho_ice","thermal_conductivity","thickness1","thickness2", etc ..., and - * for each descriptor, take the variable value and plug it into the inputs (more or less :)): - * We also start with distributed and standard values , as they tend to be used to pluck data from a multi-modle ensemble (mme) - * which can then be scaled. Doing the scaling first would be impractical, as the entire mme would have to be scaled, + femmodel->parameters->FindParam(&variable_partitions,&variable_partitions_num,NULL,NULL,QmuVariablePartitionsEnum); + femmodel->parameters->FindParam(&variable_partitions_npart,NULL,NULL,QmuVariablePartitionsNpartEnum); + femmodel->parameters->FindParam(&variable_partitions_nt,NULL,NULL,QmuVariablePartitionsNtEnum); + + + /*Go through all dakota descriptors, ex: "rho_ice","thermal_conductivity","thickness1","thickness2", etc ..., and + * for each descriptor, take the variable value and plug it into the inputs (more or less :)): + * We also start with distributed and standard values , as they tend to be used to pluck data from a multi-modle ensemble (mme) + * which can then be scaled. Doing the scaling first would be impractical, as the entire mme would have to be scaled, * which is a waste of time:*/ variablecount=0; - for(i=0;i DragCoefficient). + /*Variable is distributed. Determine root name of variable (ex: distributed_DragCoefficient_1 -> DragCoefficient). * Allocate distributed_values and fill the distributed_values with the next npart variables: */ @@ -86,11 +86,11 @@ //for (int j=0;j(parameter); @@ -104,16 +104,16 @@ variablecount++; } - + variablecount=0; /*now deal with scaled variabes:*/ - for(i=0;i DragCoefficient). Allocate distributed_values and fill the + /* Variable is scaled, determine its root name (ex: scaled_DragCoefficient_1 -> DragCoefficient). Allocate distributed_values and fill the * distributed_values with the next npart variables coming from Dakota: */ memcpy(root,strstr(descriptor,"_")+1,(strlen(strstr(descriptor,"_")+1)+1)*sizeof(char)); @@ -136,5 +136,5 @@ /*increment i to skip the distributed values just collected: */ i+=npart*nt-1; //careful, the for loop will add 1. - + /*Free allocations: */ xDelete(parameter); @@ -202,33 +202,44 @@ transientinput2 = femmodel->inputs->GetTransientInput(DummyEnum); - for(Object* & object : femmodel->elements->objects){ - Tria* element=xDynamicCast(object); - - if((int)variable_partition[element->Sid()]==-1)id=0; //grab background field - else id=distributed_values[(int)variable_partition[element->Sid()]]-1; //grab partition field - - /*recover the right field from the mme: */ - transientinput = datasetinput->GetTransientInputByOffset(id); _assert_(transientinput); - - /*copy values from the transientinput to the final transientinput2: */ - for (int j=0;jGetTriaInput(j); - element->InputServe(tria_input); - if(interpolationenum==P0Enum){ - value=tria_input->element_values[0]; - transientinput2->AddTriaTimeInput( j,1,&(element->lid),&value,P0Enum); - } - else if(interpolationenum==P1Enum){ - - /*Get values and lid list*/ - const int numvertices = element->GetNumberOfVertices(); - int *vertexlids = xNew(numvertices); - int *vertexsids = xNew(numvertices); - - /*Recover vertices ids needed to initialize inputs*/ - element->GetVerticesLidList(&vertexlids[0]); - element->GetVerticesSidList(&vertexsids[0]); - values=tria_input->element_values; - transientinput2->AddTriaTimeInput( j,numvertices,vertexlids,values,P1Enum); + for (int p=npart;p>=0;p--){ + int pp=p; + if (p==npart)pp=-1; /*so, the logic is, we want to do the -1 partition first, then + go from npart-1 to 0 in reverse order:*/ + + for (int i=0;ielements->Size();i++){ + int element_partition; + + Tria* element=xDynamicCast(femmodel->elements->GetObjectByOffset(i)); + + element_partition= (int)variable_partition[element->Sid()]; + if(element_partition!=pp)continue; + + if(element_partition==-1)id=0; //grab background field + else id=distributed_values[element_partition]-1; //grab partition field + + /*recover the right field from the mme: */ + transientinput = datasetinput->GetTransientInputByOffset(id); _assert_(transientinput); + + /*copy values from the transientinput to the final transientinput2: */ + for (int j=0;jGetTriaInput(j); + element->InputServe(tria_input); + if(interpolationenum==P0Enum){ + value=tria_input->element_values[0]; + transientinput2->AddTriaTimeInput( j,1,&(element->lid),&value,P0Enum); + } + else if(interpolationenum==P1Enum){ + + /*Get values and lid list*/ + const int numvertices = element->GetNumberOfVertices(); + int *vertexlids = xNew(numvertices); + int *vertexsids = xNew(numvertices); + + /*Recover vertices ids needed to initialize inputs*/ + element->GetVerticesLidList(&vertexlids[0]); + element->GetVerticesSidList(&vertexsids[0]); + values=tria_input->element_values; + transientinput2->AddTriaTimeInput( j,numvertices,vertexlids,values,P1Enum); + } } } @@ -247,10 +258,10 @@ /*Go through elements, copy input name to dummy, and scale it using the distributed_values and the partition vector:*/ - for(Object* & object : femmodel->elements->objects){ - Element* element=xDynamicCast(object); + for(int i=0;ielements->Size();i++){ + Element* element=xDynamicCast(femmodel->elements->GetObjectByOffset(i)); element->InputScaleFromDakota(distributed_values,partition,npart,nt,name); } - /*We created a dummy input, which was a scaled copy of the name input. Now wipe + /*We created a dummy input, which was a scaled copy of the name input. Now wipe * out the name input with the new input:*/ femmodel->inputs->ChangeEnum(DummyEnum,name);