Changeset 8798

Timestamp:

07/05/11 16:36:47 (14 years ago)

Author:

schlegel

Message:

Remove references to TriaVertexForcing and PentaVertexForcing

Location:

issm/trunk/src

Files:

• c/Container/DataSet.cpp (modified) (2 diffs)
• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/Makefile.am (modified) (2 diffs)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (1 diff)
• c/objects/Inputs/PentaVertexForcing.cpp (deleted)
• c/objects/Inputs/PentaVertexForcing.h (deleted)
• c/objects/Inputs/TriaVertexForcing.cpp (deleted)
• c/objects/Inputs/TriaVertexForcing.h (deleted)
• c/objects/objects.h (modified) (1 diff)
• m/enum/PentaVertexForcingEnum.m (deleted)
• m/enum/TriaVertexForcingEnum.m (deleted)

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

@@ -228 +228 @@
                                 dataset->AddObject(triavertexinput);}
                                 break;
-                        case TriaVertexForcingEnum:{
-                                TriaVertexForcing* triavertexforcing=NULL;
-                                triavertexforcing=new TriaVertexForcing();
-                                triavertexforcing->Demarshall(&marshalled_dataset);
-                                dataset->AddObject(triavertexforcing);}
-                                break;
                         case PentaVertexInputEnum:{
                                 PentaVertexInput* pentavertexinput=NULL;
@@ -240 +234 @@
                                 dataset->AddObject(pentavertexinput);}
                                 break;
-                        case PentaVertexForcingEnum:{
-                                PentaVertexForcing* pentavertexforcing=NULL;
-                                pentavertexforcing=new PentaVertexForcing();
-                                pentavertexforcing->Demarshall(&marshalled_dataset);
-                                dataset->AddObject(pentavertexforcing);}
-                                break;
                         case TransientInputEnum:{
                                 TransientInput* transientinput=NULL;

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

@@ -132 +132 @@
         PentaVertexInputEnum,
         TriaVertexInputEnum,
-        TriaVertexForcingEnum,
-        PentaVertexForcingEnum,
+        TriaVertexForcingEnum, //TO BE DELETED (not used anymore)
+        PentaVertexForcingEnum, //TO BE DELETED (not used anymore)
         ControlInputEnum,
         /*Params: */

issm/trunk/src/c/Makefile.am

@@ -206 +206 @@
                                         ./objects/Inputs/TriaVertexInput.h\
                                         ./objects/Inputs/TriaVertexInput.cpp\
-                                        ./objects/Inputs/TriaVertexForcing.h\
-                                        ./objects/Inputs/TriaVertexForcing.cpp\
                                         ./objects/Inputs/PentaVertexInput.h\
                                         ./objects/Inputs/PentaVertexInput.cpp\
-                                        ./objects/Inputs/PentaVertexForcing.h\
-                                        ./objects/Inputs/PentaVertexForcing.cpp\
                                         ./objects/Inputs/BoolInput.h\
                                         ./objects/Inputs/BoolInput.cpp\
@@ -894 +890 @@
                                         ./objects/Inputs/TriaVertexInput.h\
                                         ./objects/Inputs/TriaVertexInput.cpp\
-                                        ./objects/Inputs/TriaVertexForcing.h\
-                                        ./objects/Inputs/TriaVertexForcing.cpp\
                                         ./objects/Inputs/PentaVertexInput.h\
                                         ./objects/Inputs/PentaVertexInput.cpp\
-                                        ./objects/Inputs/PentaVertexForcing.h\
-                                        ./objects/Inputs/PentaVertexForcing.cpp\
                                         ./objects/Inputs/BoolInput.h\
                                         ./objects/Inputs/BoolInput.cpp\

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

@@ -111 +111 @@
                 case PentaVertexInputEnum : return "PentaVertexInput";
                 case TriaVertexInputEnum : return "TriaVertexInput";
-                case TriaVertexForcingEnum : return "TriaVertexForcing";
-                case PentaVertexForcingEnum : return "PentaVertexForcing";
                 case ControlInputEnum : return "ControlInput";
                 case ParamEnum : return "Param";

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

@@ -109 +109 @@
         else if (strcmp(name,"PentaVertexInput")==0) return PentaVertexInputEnum;
         else if (strcmp(name,"TriaVertexInput")==0) return TriaVertexInputEnum;
-        else if (strcmp(name,"TriaVertexForcing")==0) return TriaVertexForcingEnum;
-        else if (strcmp(name,"PentaVertexForcing")==0) return PentaVertexForcingEnum;
         else if (strcmp(name,"ControlInput")==0) return ControlInputEnum;
         else if (strcmp(name,"Param")==0) return ParamEnum;

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

@@ -85 +85 @@
 #include "./Inputs/IntInput.h"
 #include "./Inputs/PentaVertexInput.h"
-#include "./Inputs/PentaVertexForcing.h"
 #include "./Inputs/TriaVertexInput.h"
-#include "./Inputs/TriaVertexForcing.h"
 #include "./Inputs/ControlInput.h"
 #include "./Inputs/DatasetInput.h"