Changeset 17310

Timestamp:

02/20/14 08:12:01 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: working on SSA 1d

Location:

issm/trunk-jpl/src/c/classes

Files:

• Elements/Seg.cpp (modified) (3 diffs)
• Elements/Seg.h (modified) (3 diffs)
• gauss/GaussSeg.cpp (modified) (1 diff)
• gauss/GaussSeg.h (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Seg.cpp

@@ -138 +138 @@
 /*}}}*/
 
+void  Seg::GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum){/*{{{*/
+        
+        /* Intermediaries */
+        int nrfrontnodes,index;
+        IssmDouble  levelset[NUMVERTICES];
+
+        /*Recover parameters and values*/
+        GetInputListOnVertices(&levelset[0],levelsetenum);
+        /* Get nodes where there is no ice */
+        nrfrontnodes=0;
+        for(int i=0;i<NUMVERTICES;i++){
+                if(levelset[i]>=0.){
+                        index=i;
+                        nrfrontnodes++;
+                }
+        }
+
+        _assert_(nrfrontnodes==1);
+
+        IssmDouble* xyz_front = xNew<IssmDouble>(3);
+
+        /* Return nodes */
+        for(int dir=0;dir<3;dir++){
+                xyz_front[dir]=xyz_list[3*index+dir];
+        }
+
+        *pxyz_front=xyz_front;
+}/*}}}*/
 /*FUNCTION Seg::GetNumberOfNodes;{{{*/
 int Seg::GetNumberOfNodes(void){
@@ -209 +237 @@
 }
 /*}}}*/
+/*FUNCTION Seg::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order){{{*/
+Gauss* Seg::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order){
+
+        /*Output*/
+        Gauss* gauss = NULL;
+
+        if(xyz_list_front[0] == xyz_list[0]){
+                gauss = new GaussSeg(+1.);
+        }
+        else if(xyz_list_front[0] == xyz_list[3*1+0]){
+                gauss = new GaussSeg(-1.);
+        }
+        else{
+                _error_("front is not located on element edge");
+        }
+
+        return gauss;
+}
+/*}}}*/
 /*FUNCTION Seg::NewElementVector{{{*/
 ElementVector* Seg::NewElementVector(int approximation_enum){
@@ -235 +282 @@
 }
 /*}}}*/
+/*FUNCTION Seg::NormalSection{{{*/
+void Seg::NormalSection(IssmDouble* normal,IssmDouble* xyz_list_front){
+
+        IssmDouble* xyz_list = xNew<IssmDouble>(NUMVERTICES*3);
+        ::GetVerticesCoordinates(xyz_list,this->vertices,NUMVERTICES);
+
+        if(xyz_list_front[0]>xyz_list[0])
+         normal[0]= + 1.;
+        else
+         normal[0]= - 1.;
+
+        xDelete<IssmDouble>(xyz_list);
+}
+/*}}}*/

issm/trunk-jpl/src/c/classes/Elements/Seg.h

@@ -109 +109 @@
                 void        NodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){_error_("not implemented yet");};
                 bool        IsIceInElement();
-                void        NormalSection(IssmDouble* normal,IssmDouble* xyz_list){_error_("not implemented yet");};
+                void        NormalSection(IssmDouble* normal,IssmDouble* xyz_list);
                 void        NormalTop(IssmDouble* normal,IssmDouble* xyz_list){_error_("not implemented yet");};
                 void        NormalBase(IssmDouble* normal,IssmDouble* xyz_list){_error_("not implemented yet");};
@@ -136 +136 @@
                 Gauss*      NewGauss(void);
                 Gauss*      NewGauss(int order);
-      Gauss*      NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order){_error_("not implemented yet");};
+      Gauss*      NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order);
       Gauss*      NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order_horiz,int order_vert){_error_("not implemented yet");};
       Gauss*      NewGauss(int point1,IssmDouble fraction1,IssmDouble fraction2,bool mainlyfloating,int order){_error_("not implemented yet");};
@@ -151 +151 @@
                 bool               IsIcefront(void);
                 void        ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum){_error_("not implemented");};
-                void               GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum){_error_("not implemented");};
+                void               GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum);
                 void        GetNormalFromLSF(IssmDouble *pnormal){_error_("not implemented yet");};
 

issm/trunk-jpl/src/c/classes/gauss/GaussSeg.cpp

@@ -46 +46 @@
         xDelete<IssmPDouble>(pcoords1);
         xDelete<IssmPDouble>(pweights);
+
+        /*Initialize static fields as undefinite*/
+        weight=UNDEF;
+        coord1=UNDEF;
+}
+/*}}}*/
+/*FUNCTION GaussSeg::GaussSeg(IssmDouble position) {{{*/
+GaussSeg::GaussSeg(IssmDouble position){
+
+        /*Get gauss points*/
+        this->numgauss = 1;
+        this->coords1=xNew<IssmDouble>(numgauss);
+        this->weights=xNew<IssmDouble>(numgauss);
+
+        /*cast : */
+        _assert_(position>=-1. && position<=+1.);
+        this->coords1[0]=position;
+        this->weights[0]=1.;
 
         /*Initialize static fields as undefinite*/

issm/trunk-jpl/src/c/classes/gauss/GaussSeg.h

@@ -25 +25 @@
                 GaussSeg();
                 GaussSeg(int order);
+                GaussSeg(IssmDouble position);
                 ~GaussSeg();