Changeset 8795

Timestamp:

07/05/11 14:04:27 (14 years ago)

Author:

schlegel

Message:

Introduce TransientInput

Location:

issm/trunk/src/c

Files:

• Container/DataSet.cpp (modified) (1 diff)
• EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• modules/StringToEnumx/StringToEnumx.cpp (modified) (1 diff)
• objects/Elements/Penta.cpp (modified) (2 diffs)
• objects/Elements/Tria.cpp (modified) (3 diffs)
• objects/objects.h (modified) (1 diff)

issm/trunk/src/c/Container/DataSet.cpp

@@ -246 +246 @@
                                 dataset->AddObject(pentavertexforcing);}
                                 break;
+                        case TransientInputEnum:{
+                                TransientInput* transientinput=NULL;
+                                transientinput=new TransientInput();
+                                transientinput->Demarshall(&marshalled_dataset);
+                                dataset->AddObject(transientinput);}
+                                break;
                         case ControlInputEnum:{
                            ControlInput* controlinputinput=NULL;

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

@@ -461 +461 @@
         IntMatParamEnum,
         RheologyBbarAbsGradientEnum,
-        DragCoefficientAbsGradientEnum
+        DragCoefficientAbsGradientEnum,
+        TransientInputEnum
 };
 

issm/trunk/src/c/Makefile.am

@@ -222 +222 @@
                                         ./objects/Inputs/DatasetInput.h\
                                         ./objects/Inputs/DatasetInput.cpp\
+                                        ./objects/Inputs/TransientInput.h\
+                                        ./objects/Inputs/TransientInput.cpp\
                                         ./objects/Elements/Penta.h\
                                         ./objects/Elements/Penta.cpp\
@@ -908 +910 @@
                                         ./objects/Inputs/DatasetInput.h\
                                         ./objects/Inputs/DatasetInput.cpp\
+                                        ./objects/Inputs/TransientInput.h\
+                                        ./objects/Inputs/TransientInput.cpp\
                                         ./objects/Elements/Penta.h\
                                         ./objects/Elements/Penta.cpp\

issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -405 +405 @@
                 case RheologyBbarAbsGradientEnum : return "RheologyBbarAbsGradient";
                 case DragCoefficientAbsGradientEnum : return "DragCoefficientAbsGradient";
+                case TransientInputEnum : return "TransientInput";
                 default : return "unknown";
 

issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -403 +403 @@
         else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum;
         else if (strcmp(name,"DragCoefficientAbsGradient")==0) return DragCoefficientAbsGradientEnum;
+        else if (strcmp(name,"TransientInput")==0) return TransientInputEnum;
         else _error_("Enum %s not found",name);
 

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -7489 +7489 @@
 
         if(step==0){
-                /*This is the first time we are trying to replace the smb penta vertex input by a smb pentav vertex 
-                 *forcing, which is essentially a penta vertex input that can vary with time. So first, if there is already 
-                 an input with enum FieldEnum, squash it: */
-                this->inputs->AddInput(new PentaVertexForcing(FieldEnum,nodeinputs,time,iomodel->forcing_numtimesteps,this->parameters));
+
+                /*This is the first time we are trying to replace the smb tria vertex input by a smb triav vertex 
+                 *forcing, which is essentially a tria vertex input that can vary with time. So first, if there is already 
+                 *an input with enum FieldEnum, squash it: */
+                TransientInput* transientinput = new TransientInput(FieldEnum);
+
+                PentaVertexInput* pentavertexinput = new PentaVertexInput(FieldEnum,&nodeinputs[0]);
+                transientinput->AddTimeInput(pentavertexinput,time);
+                this->inputs->AddInput(transientinput);
+
         }
         else{
@@ -7498 +7504 @@
                 /*Ok, we can't write over the existing forcing that was created in previous step 0. Find the input, and add 
                  *values for this time step: */
-                PentaVertexForcing* forcing=(PentaVertexForcing*)inputs->GetInput(FieldEnum); _assert_(forcing);
-                forcing->AddTimeValues(&nodeinputs[0],step,time);
-
-        }
-
+                TransientInput* transientinput=(TransientInput*)inputs->GetInput(FieldEnum); _assert_(transientinput);
+
+                PentaVertexInput* pentavertexinput = new PentaVertexInput(FieldEnum,&nodeinputs[0]);
+                transientinput->AddTimeInput(pentavertexinput,time);
+
+        }
 
 }

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -5432 +5432 @@
 
         /*recover forcing for this time step: */
-        for(i=0;i<3;i++)nodeinputs[i]=iomodel->forcing[tria_vertex_ids[i]-1];
+        for(i=0;i<3;i++) nodeinputs[i]=iomodel->forcing[tria_vertex_ids[i]-1];
 
         /*process units: */
@@ -5438 +5438 @@
 
         if(step==0){
+
                 /*This is the first time we are trying to replace the smb tria vertex input by a smb triav vertex 
                  *forcing, which is essentially a tria vertex input that can vary with time. So first, if there is already 
-                 an input with enum FieldEnum, squash it: */
-                this->inputs->AddInput(new TriaVertexForcing(FieldEnum,nodeinputs,time,iomodel->forcing_numtimesteps,this->parameters));
+                 * an input with enum FieldEnum, squash it: */
+                TransientInput* transientinput = new TransientInput(FieldEnum);
+
+                TriaVertexInput* triavertexinput = new TriaVertexInput(FieldEnum,&nodeinputs[0]);
+                transientinput->AddTimeInput(triavertexinput,time);
+                this->inputs->AddInput(transientinput);
+
         }
         else{
@@ -5447 +5453 @@
                 /*Ok, we can't write over the existing forcing that was created in previous step 0. Find the input, and add 
                  *values for this time step: */
-                TriaVertexForcing* forcing=(TriaVertexForcing*)inputs->GetInput(FieldEnum); _assert_(forcing);
-
-                forcing->AddTimeValues(&nodeinputs[0],step,time);
-
-        }
-
+                TransientInput* transientinput=(TransientInput*)inputs->GetInput(FieldEnum); _assert_(transientinput);
+
+                TriaVertexInput* triavertexinput = new TriaVertexInput(FieldEnum,&nodeinputs[0]);
+                transientinput->AddTimeInput(triavertexinput,time);
+
+        }
 
 }

issm/trunk/src/c/objects/objects.h

@@ -90 +90 @@
 #include "./Inputs/ControlInput.h"
 #include "./Inputs/DatasetInput.h"
+#include "./Inputs/TransientInput.h"
 
 /*ElementResults: */