Changeset 22908

Timestamp:

07/09/18 15:17:35 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: preparing bmb_core for computation of basal melt that requires to run a core (so cannot be a module anymore)

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• analyses/L2ProjectionBaseAnalysis.cpp (modified) (1 diff)
• cores/bmb_core.cpp (added)
• cores/cores.h (modified) (1 diff)
• cores/transient_core.cpp (modified) (1 diff)
• modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -264 +264 @@
                                         ./cores/thermal_core.cpp\
                                         ./cores/smb_core.cpp\
+                                        ./cores/bmb_core.cpp\
                                         ./solutionsequences/solutionsequence_thermal_nonlinear.cpp\
                                         ./modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp\

issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.cpp

@@ -165 +165 @@
                 case SurfaceSlopeXEnum: input2 = basalelement->GetInput(SurfaceEnum); _assert_(input2); break;
                 case SurfaceSlopeYEnum: input2 = basalelement->GetInput(SurfaceEnum); _assert_(input2); break;
-                case BedSlopeXEnum:     input2 = basalelement->GetInput(BaseEnum);     _assert_(input2); break;
-                case BedSlopeYEnum:     input2 = basalelement->GetInput(BaseEnum);     _assert_(input2); break;
+                case BedSlopeXEnum:     input2 = basalelement->GetInput(BedEnum);     _assert_(input2); break;
+                case BedSlopeYEnum:     input2 = basalelement->GetInput(BedEnum);     _assert_(input2); break;
                 case LevelsetfunctionSlopeXEnum: input2 = basalelement->GetInput(MaskIceLevelsetEnum);     _assert_(input2); break;
                 case LevelsetfunctionSlopeYEnum: input2 = basalelement->GetInput(MaskIceLevelsetEnum);     _assert_(input2); break;

issm/trunk-jpl/src/c/cores/cores.h

@@ -51 +51 @@
 void esa_core(FemModel* femmodel);
 void smb_core(FemModel* femmodel);
+void bmb_core(FemModel* femmodel);
 void damage_core(FemModel* femmodel);
 void sealevelrise_core(FemModel* femmodel);

issm/trunk-jpl/src/c/cores/transient_core.cpp

@@ -320 +320 @@
                 /* from here on, prepare geometry for next time step*/
 
-                if(issmb)           smb_core(femmodel);
-                if(ismasstransport) FloatingiceMeltingRatex(femmodel);
+                if(issmb) smb_core(femmodel);
 
                 if(ismasstransport){
+                        bmb_core(femmodel);
                         masstransport_core(femmodel);
                         femmodel->UpdateVertexPositionsx();

issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.cpp

@@ -12 +12 @@
         int  basalforcing_model;
 
-        /*First, get SMB model from parameters*/
+        /*First, get BMB model from parameters*/
         femmodel->parameters->FindParam(&basalforcing_model,BasalforcingsEnum);