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

Timestamp:

12/22/21 10:39:44 (3 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/MeltingAnalysis.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/MeltingAnalysis.cpp

@@ -56 +56 @@
         iomodel->FetchDataToInput(inputs,elements,"md.geometry.surface",SurfaceEnum);
         iomodel->FetchDataToInput(inputs,elements,"md.geometry.base",BaseEnum);
-        iomodel->FetchDataToInput(inputs,elements,"md.solidearth.initialsealevel",SealevelEnum,0);
+        iomodel->FetchDataToInput(inputs,elements,"md.initialization.sealevel",SealevelEnum,0);
         iomodel->FetchDataToInput(inputs,elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);
         if(iomodel->domaintype!=Domain2DhorizontalEnum){
@@ -69 +69 @@
 /*Finite Element Analysis*/
 void           MeltingAnalysis::Core(FemModel* femmodel){/*{{{*/
+        _error_("not implemented");
+}/*}}}*/
+void           MeltingAnalysis::PreCore(FemModel* femmodel){/*{{{*/
         _error_("not implemented");
 }/*}}}*/
@@ -115 +118 @@
         xDelete<IssmDouble>(basis);
         delete gauss;
-        basalelement->DeleteMaterials(); delete basalelement;
+        if(basalelement->IsSpawnedElement()){basalelement->DeleteMaterials(); delete basalelement;};
         return Ke;
 }/*}}}*/

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