Changeset 26744 for issm/trunk/src/c/analyses/GLheightadvectionAnalysis.cpp

Timestamp:

12/22/21 10:39:44 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 26742

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/analyses/GLheightadvectionAnalysis.cpp (modified) (3 diffs)

issm/trunk/src/c ¶

@@ -20 +20 @@
 issm
 kriging
+issm_slc
 issm_slr
 issm_ocean

@@ -20 +20 @@
 issm
 kriging
+issm_slc
 issm_slr
 issm_ocean

issm/trunk/src/c/analyses/GLheightadvectionAnalysis.cpp ¶

@@ -47 +47 @@
 /*Finite Element Analysis*/
 void           GLheightadvectionAnalysis::Core(FemModel* femmodel){/*{{{*/
+        _error_("not implemented");
+}/*}}}*/
+void           GLheightadvectionAnalysis::PreCore(FemModel* femmodel){/*{{{*/
         _error_("not implemented");
 }/*}}}*/
@@ -90 +93 @@
         IssmDouble*    basis  = xNew<IssmDouble>(numnodes);
         IssmDouble*    dbasis = xNew<IssmDouble>(dim*numnodes);
-        IssmDouble*    Bprime = xNew<IssmDouble>(dim*numnodes);
         IssmDouble     D[2][2] = {0.};
 
@@ -175 +177 @@
         xDelete<IssmDouble>(dbasis);
         delete gauss;
-        if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;};
+        if(basalelement->IsSpawnedElement()){basalelement->DeleteMaterials(); delete basalelement;};
         return Ke;
 

@@ -20 +20 @@
 issm
 kriging
+issm_slc
 issm_slr
 issm_ocean