Changeset 9081 for issm/trunk

Timestamp:

07/20/11 07:30:25 (14 years ago)

Author:

Mathieu Morlighem

Message:

Extended new spcthickness format to balancethickness

Location:

issm/trunk/src/c/modules

Files:

• IoModelToConstraintsx/IoModelToConstraintsx.cpp (modified) (3 diffs)
• ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp (modified) (3 diffs)
• ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp (modified) (1 diff)
• ModelProcessorx/Thermal/CreateConstraintsThermal.cpp (modified) (1 diff)

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

@@ -60 +60 @@
                 }
         }
-        else{
+        else if (M==iomodel->numberofvertices+1){
                 /*transient: create transient Spct objects. Same logic, except we need to retrieve 
                  * various times and values to initialize an Spct object: */
@@ -95 +95 @@
                 }
         }
+        else{
+                _error_("Size of field %s not supported",EnumToStringx(vector_enum));
+        }
 
         /*Free ressources:*/
@@ -100 +103 @@
         xfree((void**)&times);
         xfree((void**)&values);
-
 }

issm/trunk/src/c/modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp

@@ -1 @@
-/*
- * CreateConstraintsBalancethickness.c:
- */
-
 #include "../../../Container/Container.h"
+#include "../../../modules/modules.h"
 #include "../../../io/io.h"
 #include "../../../toolkits/toolkits.h"
@@ -12 +9 @@
 
 void    CreateConstraintsBalancethickness(Constraints** pconstraints, IoModel* iomodel,FILE* iomodel_handle){
-
-        /*Intermediary*/
-        int i;
-        int count;
 
         /*Output*/
@@ -28 +21 @@
         /*Do not add constraints in DG*/
         if(!iomodel->prognostic_DG){
-
-                /*Fetch data: */
-                IoModelFetchData(&iomodel->spcthickness,NULL,NULL,iomodel_handle,SpcthicknessEnum);
-
-                /*Initialize counter*/
-                count=0;
-
-                /*Create spcs from x,y,z, as well as the spc values on those spcs: */
-                for (i=0;i<iomodel->numberofvertices;i++){
-                        if(iomodel->my_vertices[i]){
-
-                                if ((int)iomodel->spcthickness[2*i]){
-
-                                        constraints->AddObject(new Spc(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,
-                                                                        *(iomodel->spcthickness+2*i+1),BalancethicknessAnalysisEnum));//we enforce first translation degree of freedom, for temperature
-                                        count++;
-                                }
-                        }
-                }
-
-                /*Free data: */
-                xfree((void**)&iomodel->spcthickness);
+                IoModelToConstraintsx(constraints,iomodel,iomodel_handle,SpcthicknessEnum,BalancethicknessAnalysisEnum);
         }
 

issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp

@@ -10 +10 @@
 void    CreateConstraintsPrognostic(Constraints** pconstraints, IoModel* iomodel,FILE* iomodel_handle){
 
-        /*Intermediary*/
-        int i;
-        int count;
-        
         /*Output*/
         Constraints *constraints = NULL;
-        Spc         *spc         = NULL;
 
         /*Recover pointer: */

issm/trunk/src/c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp

@@ -27 +27 @@
         if(!constraints) constraints = new Constraints(ConstraintsEnum);
 
-        /*return if 2d mesh*/
-        if (iomodel->dim==2) goto cleanup_and_return;
-
-        /*Create constraints: */
-        IoModelToConstraintsx(constraints,iomodel,iomodel_handle,SpctemperatureEnum,ThermalAnalysisEnum);
-
-        cleanup_and_return:
+        /*Only 3d mesh supported*/
+        if (iomodel->dim==3){
+                IoModelToConstraintsx(constraints,iomodel,iomodel_handle,SpctemperatureEnum,ThermalAnalysisEnum);
+        }
 
         /*Assign output pointer: */