Changeset 24313 for issm/trunk/src/c/analyses/StressbalanceVerticalAnalysis.cpp

Timestamp:

11/01/19 12:01:57 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24310

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/analyses/StressbalanceVerticalAnalysis.cpp (modified) (5 diffs)

issm/trunk/src/c

@@ -5 +5 @@
 *.obj
 *.exe
+*.mod
 appscan.*
 ouncemake*
@@ -14 +15 @@
 probe.results
 stXXXX*
-*.deps
-*.dirstamp
+.deps
+.dirstamp
 .libs
 issm
@@ -21 +22 @@
 issm_slr
 issm_ocean
-lnb_param.mod
-lovenb_sub.mod
-model.mod
-util.mod
+issm_dakota

@@ -5 +5 @@
 *.obj
 *.exe
+*.mod
 appscan.*
 ouncemake*
@@ -14 +15 @@
 probe.results
 stXXXX*
-*.deps
-*.dirstamp
+.deps
+.dirstamp
 .libs
 issm
@@ -21 +22 @@
 issm_slr
 issm_ocean
-lnb_param.mod
-lovenb_sub.mod
-model.mod
-util.mod
+issm_dakota

issm/trunk/src/c/analyses/StressbalanceVerticalAnalysis.cpp

@@ -51 +51 @@
 
                                 if (reCast<int,IssmDouble>(iomodel->Data("md.flowequation.borderFS")[i])){
-                                        constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,0,0,StressbalanceVerticalAnalysisEnum)); //spc to zero as vertical velocity is done in Horiz for FS
+                                        constraints->AddObject(new SpcStatic(count+1,i+1,0,0,StressbalanceVerticalAnalysisEnum)); //spc to zero as vertical velocity is done in Horiz for FS
                                         count++;
                                 }
                                 else if (!xIsNan<IssmDouble>(spcvz[i])){
-                                        constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,0,
+                                        constraints->AddObject(new SpcStatic(count+1,i+1,0,
                                                                         spcvz[i],StressbalanceVerticalAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx.
                                         count++;
@@ -74 +74 @@
 
 }/*}}}*/
-void StressbalanceVerticalAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/
+void StressbalanceVerticalAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel,bool isamr){/*{{{*/
 
         /*return if not 3d mesh*/
@@ -134 +134 @@
                 case BasalforcingsPicoEnum:
                         iomodel->FetchDataToInput(elements,"md.basalforcings.basin_id",BasalforcingsPicoBasinIdEnum);
+                        break;
+                case BasalforcingsIsmip6Enum:
+                        iomodel->FetchDataToInput(elements,"md.basalforcings.basin_id",BasalforcingsIsmip6BasinIdEnum);
+                        break;
+                case BeckmannGoosseFloatingMeltRateEnum:
+                        iomodel->FetchDataToInput(elements,"md.basalforcings.ocean_salinity",BasalforcingsOceanSalinityEnum);
+                        iomodel->FetchDataToInput(elements,"md.basalforcings.ocean_temp",BasalforcingsOceanTempEnum);
                         break;
                 default:
@@ -526 +533 @@
         /*Get dof list and vertices coordinates: */
         element->GetVerticesCoordinates(&xyz_list);
-        element->GetDofList(&doflist,NoneApproximationEnum,GsetEnum);
+        element->GetDofListLocal(&doflist,NoneApproximationEnum,GsetEnum);
         IssmDouble*  values    = xNew<IssmDouble>(numdof);
         IssmDouble*  vx        = xNew<IssmDouble>(numnodes);
@@ -584 +591 @@
          *so the pressure is just the pressure at the z elevation: except it this is a HOFS element */
         if(approximation!=HOFSApproximationEnum &&  approximation!=SSAFSApproximationEnum){
-                rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum);
-                g       = element->GetMaterialParameter(ConstantsGEnum);
+                rho_ice = element->FindParam(MaterialsRhoIceEnum);
+                g       = element->FindParam(ConstantsGEnum);
                 element->GetInputListOnNodes(&surface[0],SurfaceEnum,0.);
                 for(i=0;i<numnodes;i++) pressure[i]=rho_ice*g*(surface[i]-xyz_list[i*3+2]);

@@ -5 +5 @@
 *.obj
 *.exe
+*.mod
 appscan.*
 ouncemake*
@@ -14 +15 @@
 probe.results
 stXXXX*
-*.deps
-*.dirstamp
+.deps
+.dirstamp
 .libs
 issm
@@ -21 +22 @@
 issm_slr
 issm_ocean
-lnb_param.mod
-lovenb_sub.mod
-model.mod
-util.mod
+issm_dakota