Changeset 27216

Timestamp:

08/17/22 15:52:36 (3 years ago)

Author:

Eric.Larour

Message:

CHG: MmeToInputx needs to be its own module.

Location:

issm/branches/trunk-larour-SLPS2022/src/c

Files:

• Makefile.am (modified) (1 diff)
• modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp (modified) (1 diff)
• modules/MmeToInputx (added)
• modules/MmeToInputx/MmeToInputx.cpp (added)
• modules/MmeToInputx/MmeToInputx.h (added)
• modules/modules.h (modified) (1 diff)

issm/branches/trunk-larour-SLPS2022/src/c/Makefile.am

@@ -199 +199 @@
         ./toolkits/ToolkitOptions.cpp \
         ./modules/MmeToInputFromIdx/MmeToInputFromIdx.cpp\
+        ./modules/MmeToInputx/MmeToInputx.cpp\
         ./modules/ModelProcessorx/ModelProcessorx.cpp \
         ./modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp \

issm/branches/trunk-larour-SLPS2022/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp

@@ -190 +190 @@
 
 }       //}}}
-void  MmeToInputx(FemModel* femmodel,IssmDouble* distributed_values,IssmDouble* variable_partition,int npart,int rootenum, int interpolationenum){ /*{{{*/
-
-        TransientInput* transientinput  = NULL;
-        TransientInput* transientinput2 = NULL;
-        Tria* element                    = NULL;
-        IssmDouble value;
-        IssmDouble* values               = NULL;
-        IssmDouble* times                = NULL;
-        int N;
-        int id;
-
-        /*find thickness dataset: */
-        DatasetInput* datasetinput = femmodel->inputs->GetDatasetInput(rootenum);
-
-        /*Initialize new transient input: */
-        transientinput = datasetinput->GetTransientInputByOffset(0); _assert_(transientinput);
-        transientinput->GetAllTimes(&times,&N);
-        femmodel->inputs->SetTransientInput(DummyEnum,times,N);
-        transientinput2 = femmodel->inputs->GetTransientInput(DummyEnum); transientinput2->Configure(femmodel->parameters);
-
-        for(Object* & object : femmodel->elements->objects){
-                Tria*   element=xDynamicCast<Tria*>(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;j<N;j++){
-                        TriaInput* tria_input=transientinput->GetTriaInput(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<int>(numvertices);
-                                int        *vertexsids      = xNew<int>(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);
-                        }
-                }
-        }
-
-        /*wipe out existing SurfaceloadIceThicknessRateEnum dataset:*/
-        femmodel->inputs->ChangeEnum(DummyEnum,rootenum);
-
-}       //}}}
 void  InputScaleFromDakotax(FemModel* femmodel,IssmDouble* distributed_values,IssmDouble* partition, int npart, int nt, int name){ /*{{{*/
 

issm/branches/trunk-larour-SLPS2022/src/c/modules/modules.h

@@ -73 +73 @@
 #include "./ModelProcessorx/ModelProcessorx.h"
 #include "./MmeToInputFromIdx/MmeToInputFromIdx.h"
+#include "./MmeToInputx/MmeToInputx.h"
 #include "./ParseToolkitsOptionsx/ParseToolkitsOptionsx.h"
 #include "./NodalValuex/NodalValuex.h"