Index: /issm/trunk-jpl/src/c/Makefile.am =================================================================== --- /issm/trunk-jpl/src/c/Makefile.am (revision 15460) +++ /issm/trunk-jpl/src/c/Makefile.am (revision 15461) @@ -243,4 +243,5 @@ ./modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp\ ./modules/ModelProcessorx/NodesPartitioning.cpp\ + ./modules/ModelProcessorx/EdgesPartitioning.cpp\ ./modules/ModelProcessorx/SortDataSets.cpp\ ./modules/ModelProcessorx/UpdateCounters.cpp\ Index: /issm/trunk-jpl/src/c/classes/IoModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/IoModel.cpp (revision 15460) +++ /issm/trunk-jpl/src/c/classes/IoModel.cpp (revision 15461) @@ -28,5 +28,4 @@ this->my_elements=NULL; - this->my_nodes=NULL; this->my_vertices=NULL; @@ -70,5 +69,4 @@ /*Initialize permanent data: */ this->my_elements = NULL; - this->my_nodes = NULL; this->my_vertices = NULL; @@ -108,5 +106,4 @@ xDelete(this->my_elements); - xDelete(this->my_nodes); xDelete(this->my_vertices); Index: /issm/trunk-jpl/src/c/classes/IoModel.h =================================================================== --- /issm/trunk-jpl/src/c/classes/IoModel.h (revision 15460) +++ /issm/trunk-jpl/src/c/classes/IoModel.h (revision 15461) @@ -28,5 +28,4 @@ /*Partitioning*/ bool *my_elements; - bool *my_nodes; int *my_vertices; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp (revision 15460) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp (revision 15461) @@ -16,6 +16,6 @@ int vertex_id; int io_index; - bool continuous_galerkin=true; int stabilization; + bool *my_nodes=NULL; /*Fetch parameters: */ @@ -28,8 +28,4 @@ if(!nodes) nodes = new Nodes(); - /*Continuous Galerkin partition of nodes: */ - if(stabilization==3) continuous_galerkin=false; - NodesPartitioning(&iomodel->my_nodes,iomodel->my_elements,iomodel->my_vertices,iomodel,continuous_galerkin); - /*Check in 3d*/ if(stabilization==3 && iomodel->dim==3) _error_("DG 3d not implemented yet"); @@ -38,5 +34,5 @@ iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); - if(continuous_galerkin){ + if(stabilization!=3){ /*Build Nodes dataset (Continuous Galerkin)*/ @@ -53,8 +49,9 @@ /*Build Nodes dataset -> 3 for each element (Discontinuous Galerkin)*/ + NodesPartitioning(&my_nodes,iomodel->my_elements,iomodel->my_vertices,iomodel,false); for (i=0;inumberofelements;i++){ for (j=0;j<3;j++){ - if(iomodel->my_nodes[3*i+j]){ + if(my_nodes[3*i+j]){ //Get index of the vertex on which the current node is located @@ -76,4 +73,5 @@ /*Clean fetched data: */ iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); + xDelete(my_nodes); /*Assign output pointer: */ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp (revision 15460) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp (revision 15461) @@ -11,7 +11,4 @@ void CreateNodesBedSlope(Nodes** pnodes, IoModel* iomodel){ - /*Intermediary*/ - bool continuous_galerkin=true; - /*Recover pointer: */ Nodes* nodes=*pnodes; @@ -19,7 +16,4 @@ /*Create nodes if they do not exist yet*/ if(!nodes) nodes = new Nodes(); - - /*Continuous Galerkin partition of nodes: */ - NodesPartitioning(&iomodel->my_nodes,iomodel->my_elements,iomodel->my_vertices,iomodel,continuous_galerkin); /*First fetch data: */ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (revision 15460) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (revision 15461) @@ -317,23 +317,17 @@ if(ismacayealpattyn&& fe_ssa==1){ - int v1,v2,el1,el2; - bool my_edge; + int v1,v2; + bool *my_edges = NULL; if(Mx!=iomodel->numberofvertices) _error_("transient spc not supported yet"); - CreateEdges(iomodel); + EdgesPartitioning(&my_edges,iomodel); for(i=0;inumberofedges;i++){ - v1 = iomodel->edges[4*i+0]-1; - v2 = iomodel->edges[4*i+1]-1; - el1= iomodel->edges[4*i+2]-1; - el2= iomodel->edges[4*i+3]-1; - - my_edge = iomodel->my_elements[el1]; - if(!my_edge && el2>=0){ - my_edge = iomodel->my_elements[el2]; - } - - if(my_edge){ + if(my_edges[i]){ + + v1 = iomodel->edges[4*i+0]-1; + v2 = iomodel->edges[4*i+1]-1; + if(!xIsNan(spcvx[v1]) && !xIsNan(spcvx[v2])){ constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+iomodel->numberofvertices+i+1, @@ -355,4 +349,7 @@ } } + + /*Clean up*/ + xDelete(my_edges); } Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp (revision 15460) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp (revision 15461) @@ -12,5 +12,4 @@ /*Intermediary*/ - bool continuous_galerkin=true; bool isstokes,isl1l2,ismacayealpattyn; int finiteelementssa; @@ -34,7 +33,4 @@ } - /*Continuous Galerkin partition of nodes: */ - NodesPartitioning(&iomodel->my_nodes,iomodel->my_elements,iomodel->my_vertices,iomodel,continuous_galerkin); - /*Create nodes: */ iomodel->FetchData(9,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBordermacayealEnum,FlowequationBorderstokesEnum, @@ -53,26 +49,15 @@ /*Quadratic element*/ - CreateEdges(iomodel); + bool *my_edges = NULL; + EdgesPartitioning(&my_edges,iomodel); CreateElementToEdgeConnectivity(iomodel); - int element1,element2; - bool my_edge; for(int i=0;inumberofedges;i++){ - - /*Get left and right elements*/ - element1=iomodel->edges[4*i+2]-1; //edges are [node1 node2 elem1 elem2] - element2=iomodel->edges[4*i+3]-1; //edges are [node1 node2 elem1 elem2] - - /*Check whether we should include this edge (element2 is -2 for boundary edges)*/ - my_edge = iomodel->my_elements[element1]; - if(!my_edge && element2>=0){ - my_edge = iomodel->my_elements[element2]; - } - - /*Add node on edge*/ - if(my_edge){ + if(my_edges[i]){ nodes->AddObject(new Node(iomodel->nodecounter+iomodel->numberofvertices+i+1,iomodel->numberofvertices+i,0,0,iomodel,DiagnosticHorizAnalysisEnum)); } } + /*Clean up*/ + xDelete(my_edges); } Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp (revision 15460) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp (revision 15461) @@ -12,5 +12,4 @@ /*Intermediary*/ - bool continuous_galerkin = true; bool ishutter; @@ -29,7 +28,4 @@ return; } - - /*Continuous Galerkin partition of nodes: */ - NodesPartitioning(&iomodel->my_nodes,iomodel->my_elements,iomodel->my_vertices,iomodel,continuous_galerkin); /*First fetch data: */ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp (revision 15460) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp (revision 15461) @@ -11,7 +11,4 @@ void CreateNodesDiagnosticVert(Nodes** pnodes, IoModel* iomodel){ - /*Intermediary*/ - bool continuous_galerkin=true; - /*Recover pointer: */ Nodes* nodes=*pnodes; @@ -25,7 +22,4 @@ return; } - - /*Continuous Galerkin partition of nodes: */ - NodesPartitioning(&iomodel->my_nodes,iomodel->my_elements,iomodel->my_vertices,iomodel,continuous_galerkin); /*First fetch data: */ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/EdgesPartitioning.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/EdgesPartitioning.cpp (revision 15461) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/EdgesPartitioning.cpp (revision 15461) @@ -0,0 +1,39 @@ +/*!\file: EdgesPartitioning.cpp + * \brief: partition elements and nodes and vertices + */ + +#include +#include "../../classes/classes.h" +#include "../../shared/shared.h" +#include "./ModelProcessorx.h" + +void EdgesPartitioning(bool** pmy_edges,IoModel* iomodel){ + + /*Intermediaries*/ + int el1,el2; + bool my_edge; + + /*Get edges and elements*/ + CreateEdges(iomodel); + + /*output: */ + bool* my_edges=xNew(iomodel->numberofedges); + + for(int i=0;inumberofedges;i++){ + + /*Get left and right elements*/ + el1=iomodel->edges[4*i+2]-1; //edges are [node1 node2 elem1 elem2] + el2=iomodel->edges[4*i+3]-1; //edges are [node1 node2 elem1 elem2] + + /*Check whether we should include this edge (el2 is -2 for boundary edges)*/ + my_edge = iomodel->my_elements[el1]; + if(!my_edge && el2>=0){ + my_edge = iomodel->my_elements[el2]; + } + + my_edges[i] = my_edge; + } + + /*Free data and assign output pointers */ + *pmy_edges=my_edges; +} Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp (revision 15460) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp (revision 15461) @@ -11,7 +11,4 @@ void CreateNodesEnthalpy(Nodes** pnodes, IoModel* iomodel){ - /*Intermediary*/ - bool continuous_galerkin=true; - /*Recover pointer: */ Nodes* nodes=*pnodes; @@ -19,7 +16,4 @@ /*Create nodes if they do not exist yet*/ if(!nodes) nodes = new Nodes(); - - /*Continuous Galerkin partition of nodes: */ - NodesPartitioning(&iomodel->my_nodes,iomodel->my_elements,iomodel->my_vertices,iomodel,continuous_galerkin); /*Create nodes and vertices: */ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateNodesGia.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateNodesGia.cpp (revision 15460) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateNodesGia.cpp (revision 15461) @@ -11,7 +11,4 @@ void CreateNodesGia(Nodes** pnodes, IoModel* iomodel){ - /*Intermediary*/ - bool continuous_galerkin=true; - /*Recover pointer: */ Nodes* nodes=*pnodes; @@ -19,7 +16,4 @@ /*Create nodes if they do not exist yet*/ if(!nodes) nodes = new Nodes(); - - /*Continuous Galerkin partition of nodes: */ - NodesPartitioning(&iomodel->my_nodes,iomodel->my_elements,iomodel->my_vertices,iomodel,continuous_galerkin); /*First fetch data: */ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateNodesHydrologyDCEfficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateNodesHydrologyDCEfficient.cpp (revision 15460) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateNodesHydrologyDCEfficient.cpp (revision 15461) @@ -13,5 +13,4 @@ /*Intermediary*/ bool isefficientlayer; - bool continuous_galerkin=true; int hydrology_model; @@ -36,7 +35,4 @@ } - /*Continuous Galerkin partition of nodes: */ - NodesPartitioning(&iomodel->my_nodes,iomodel->my_elements,iomodel->my_vertices,iomodel,continuous_galerkin); - /*Create nodes and vertices: */ iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateNodesHydrologyDCInefficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateNodesHydrologyDCInefficient.cpp (revision 15460) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateNodesHydrologyDCInefficient.cpp (revision 15461) @@ -12,5 +12,4 @@ /*Intermediary*/ - bool continuous_galerkin=true; int hydrology_model; @@ -30,7 +29,4 @@ } - /*Continuous Galerkin partition of nodes: */ - NodesPartitioning(&iomodel->my_nodes,iomodel->my_elements,iomodel->my_vertices,iomodel,continuous_galerkin); - /*Create nodes and vertices: */ iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateNodesHydrologyShreve.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateNodesHydrologyShreve.cpp (revision 15460) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateNodesHydrologyShreve.cpp (revision 15461) @@ -13,5 +13,4 @@ /*Intermediary*/ int hydrology_model; - bool continuous_galerkin=true; /*Fetch parameters: */ @@ -30,7 +29,4 @@ } - /*Continuous Galerkin partition of nodes: */ - NodesPartitioning(&iomodel->my_nodes,iomodel->my_elements,iomodel->my_vertices,iomodel,continuous_galerkin); - /*Create nodes and vertices: */ iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp (revision 15460) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp (revision 15461) @@ -11,7 +11,4 @@ void CreateNodesMelting(Nodes** pnodes, IoModel* iomodel){ - /*Intermediary*/ - bool continuous_galerkin=true; - /*Recover pointer: */ Nodes* nodes=*pnodes; @@ -19,7 +16,4 @@ /*Create nodes if they do not exist yet*/ if(!nodes) nodes = new Nodes(); - - /*Continuous Galerkin partition of nodes: */ - NodesPartitioning(&iomodel->my_nodes,iomodel->my_elements,iomodel->my_vertices,iomodel,continuous_galerkin); /*First fetch data: */ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h (revision 15460) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h (revision 15461) @@ -116,4 +116,5 @@ void ElementsAndVerticesPartitioning(bool** pmy_elements, int** pmy_vertices, IoModel* iomodel); void NodesPartitioning(bool** pmy_nodes,bool* my_elements, int* my_vertices, IoModel* iomodel, bool continuous); +void EdgesPartitioning(bool** pmy_nodes,IoModel* iomodel); /*Connectivity*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/NodesPartitioning.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/NodesPartitioning.cpp (revision 15460) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/NodesPartitioning.cpp (revision 15461) @@ -20,10 +20,4 @@ void NodesPartitioning(bool** pmy_nodes,bool* my_elements, int* my_vertices, IoModel* iomodel, bool continuous){ - /*First thing, this is a new partition for a new analysis_type, therefore, - * to avoid a leak, erase the nodes partition that might come through - * pmy_nodes: */ - xDelete(*pmy_nodes); - - /*Now, depending on whether we are running galerkin discontinous or continuous elements, carry out a different partition of the nodes: */ if(continuous==true) ContinuousGalerkinNodesPartitioning(pmy_nodes,my_elements, my_vertices, iomodel); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp (revision 15460) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp (revision 15461) @@ -16,6 +16,6 @@ int vertex_id; int io_index; - bool continuous_galerkin=true; int stabilization; + bool *my_nodes = NULL; /*Fetch parameters: */ @@ -28,8 +28,4 @@ if(!nodes) nodes = new Nodes(); - /*Create partition of nodes: */ - if(stabilization==3) continuous_galerkin=false; - NodesPartitioning(&iomodel->my_nodes,iomodel->my_elements,iomodel->my_vertices,iomodel,continuous_galerkin); - /*Check in 3d*/ if(stabilization==3 && iomodel->dim==3) _error_("DG 3d not implemented yet"); @@ -37,5 +33,5 @@ /*First fetch data: */ iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); - if(continuous_galerkin){ + if(stabilization!=3){ /*Build Nodes dataset (Continuous Galerkin)*/ @@ -53,8 +49,9 @@ /*Build Nodes dataset -> 3 for each element (Discontinuous Galerkin)*/ + NodesPartitioning(&my_nodes,iomodel->my_elements,iomodel->my_vertices,iomodel,false); for (i=0;inumberofelements;i++){ for (j=0;j<3;j++){ - if(iomodel->my_nodes[3*i+j]){ + if(my_nodes[3*i+j]){ //Get index of the vertex on which the current node is located @@ -76,4 +73,5 @@ /*Clean fetched data: */ iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); + xDelete(my_nodes); /*Assign output pointer: */ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp (revision 15460) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp (revision 15461) @@ -11,7 +11,4 @@ void CreateNodesSurfaceSlope(Nodes** pnodes, IoModel* iomodel){ - /*Intermediary*/ - bool continuous_galerkin=true; - /*Recover pointer: */ Nodes* nodes=*pnodes; @@ -19,7 +16,4 @@ /*Create nodes if they do not exist yet*/ if(!nodes) nodes = new Nodes(); - - /*Continuous Galerkin partition of nodes: */ - NodesPartitioning(&iomodel->my_nodes,iomodel->my_elements,iomodel->my_vertices,iomodel,continuous_galerkin); /*First fetch data: */ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp (revision 15460) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp (revision 15461) @@ -11,7 +11,4 @@ void CreateNodesThermal(Nodes** pnodes, IoModel* iomodel){ - /*Intermediary*/ - bool continuous_galerkin=true; - /*Recover pointer: */ Nodes* nodes=*pnodes; @@ -19,7 +16,4 @@ /*Create nodes if they do not exist yet*/ if(!nodes) nodes = new Nodes(); - - /*Continuous Galerkin partition of nodes: */ - NodesPartitioning(&iomodel->my_nodes,iomodel->my_elements,iomodel->my_vertices,iomodel,continuous_galerkin); /*Create nodes and vertices: */