Changeset 17085

Timestamp:

01/09/14 14:20:47 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: merging all SMB modules into one for simplicity

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• analyses/MasstransportAnalysis.cpp (modified) (1 diff)
• classes/Materials/Matpar.cpp (modified) (1 diff)
• cores/masstransport_core.cpp (modified) (3 diffs)
• modules/Delta18oParameterizationx (deleted)
• modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• modules/PositiveDegreeDayx (deleted)
• modules/SmbGradientsx (deleted)
• modules/SurfaceMassBalancex (added)
• modules/SurfaceMassBalancex/.deps (added)
• modules/SurfaceMassBalancex/.deps/SurfaceMassBalancex.Plo (added)
• modules/SurfaceMassBalancex/.deps/libISSMCore_a-SurfaceMassBalancex.Po (added)
• modules/SurfaceMassBalancex/.deps/libISSMRose_a-SurfaceMassBalancex.r2cpp.Po (added)
• modules/SurfaceMassBalancex/SurfaceMassBalancex.cpp (added)
• modules/SurfaceMassBalancex/SurfaceMassBalancex.h (added)
• modules/modules.h (modified) (3 diffs)
• shared/Enum/EnumDefinitions.h (modified) (1 diff)
• shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• shared/Enum/StringToEnumx.cpp (modified) (4 diffs)

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

@@ -304 +304 @@
                                         ./modules/SpcNodesx/SpcNodesx.h\
                                         ./modules/SpcNodesx/SpcNodesx.cpp\
-                                        ./modules/PositiveDegreeDayx/PositiveDegreeDayx.h\
-                                        ./modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp\
-                                        ./modules/Delta18oParameterizationx/Delta18oParameterizationx.h\
-                                        ./modules/Delta18oParameterizationx/Delta18oParameterizationx.cpp\
-                                        ./modules/SmbGradientsx/SmbGradientsx.h\
-                                        ./modules/SmbGradientsx/SmbGradientsx.cpp\
+                                        ./modules/SurfaceMassBalancex/SurfaceMassBalancex.h\
+                                        ./modules/SurfaceMassBalancex/SurfaceMassBalancex.cpp\
                                         ./modules/MeshPartitionx/MeshPartitionx.h\
                                         ./modules/Reducevectorgtofx/Reducevectorgtofx.cpp\

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

@@ -109 +109 @@
                         iomodel->FetchDataToInput(elements,SurfaceforcingsBNegEnum);
                         break;
+                case SMBhenningEnum:
+                        iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum,0.);
+                        break;
                 default:
                         _error_("Surface mass balance model "<<EnumToStringx(smb_model)<<" not supported yet");

issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp

@@ -52 +52 @@
                         break;
                 case SMBgradientsEnum:
+                        /*Nothing to add*/
+                        break;
+                case SMBhenningEnum:
                         /*Nothing to add*/
                         break;

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

@@ -14 +14 @@
         /*parameters: */
         int    i;
-        int    numoutputs,meshtype,smb_model;
+        int    numoutputs,meshtype;
         bool   save_results;
         bool   issmbgradients,ispdd,isdelta18o,isFS,isfreesurface,dakota_analysis;
@@ -25 +25 @@
         /*recover parameters: */
         femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
-        femmodel->parameters->FindParam(&smb_model,SurfaceforcingsEnum);
         femmodel->parameters->FindParam(&isFS,FlowequationIsFSEnum);
         femmodel->parameters->FindParam(&isfreesurface,MasstransportIsfreesurfaceEnum);
@@ -41 +40 @@
         }
 
-        switch(smb_model){
-                case SMBEnum:
-                        /*Nothing to be done*/
-                        break;
-                case SMBpddEnum:
-                        femmodel->parameters->FindParam(&isdelta18o,SurfaceforcingsIsdelta18oEnum);
-                        if(isdelta18o){
-                                if(VerboseSolution()) _printf0_("   call Delta18oParametrization module\n");
-                                Delta18oParameterizationx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
-                        } 
-                        if(VerboseSolution()) _printf0_("   call positive degree day module\n");
-                        PositiveDegreeDayx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
-                        break;
-                case SMBgradientsEnum:
-                        if(VerboseSolution())_printf_(" call smb gradients module\n\n");
-                        SmbGradientsx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
-                        break;
-                default:
-                        _error_("Surface mass balance model "<<EnumToStringx(smb_model)<<" not supported yet");
-        }
+        /*Calculate new Surface Mass Balance (SMB)*/
+        SurfaceMassBalancex(femmodel);
 
+        /*Transport mass or free surface*/
         if(isFS && isfreesurface){
                 if(VerboseSolution()) _printf0_("   call free surface computational core\n");

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -115 +115 @@
                         /*Nothing to add to parameters*/
                         break;
+                case SMBhenningEnum:
+                        /*Nothing to add to parameters*/
+                        break;
                 default:
                         _error_("Surface mass balance model "<<EnumToStringx(smb_model)<<" not supported yet");

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

@@ -24 +24 @@
 #include "./CreateNodalConstraintsx/CreateNodalConstraintsx.h"
 #include "./CreateJacobianMatrixx/CreateJacobianMatrixx.h"
-#include "./Delta18oParameterizationx/Delta18oParameterizationx.h"
 #include "./DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.h"
 #include "./ElementConnectivityx/ElementConnectivityx.h"
@@ -75 +74 @@
 #include "./ConstraintsStatex/ConstraintsStatex.h"
 #include "./PointCloudFindNeighborsx/PointCloudFindNeighborsx.h"
-#include "./PositiveDegreeDayx/PositiveDegreeDayx.h"
 #include "./PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.h"
 #include "./Reduceloadx/Reduceloadx.h"
@@ -85 +83 @@
 #include "./Scotchx/Scotchx.h"
 #include "./Shp2Kmlx/Shp2Kmlx.h"
-#include "./SmbGradientsx/SmbGradientsx.h"
+#include "./SurfaceMassBalancex/SurfaceMassBalancex.h"
 #include "./Solverx/Solverx.h"
 #include "./SystemMatricesx/SystemMatricesx.h"

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -297 +297 @@
         SurfaceforcingsBPosEnum,
         SurfaceforcingsBNegEnum,
-        SMBlapserate,
+        SMBhenningEnum,
         /*TO BE REMOVED*/
         SurfaceforcingsIspddEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -301 +301 @@
                 case SurfaceforcingsBPosEnum : return "SurfaceforcingsBPos";
                 case SurfaceforcingsBNegEnum : return "SurfaceforcingsBNeg";
+                case SMBhenningEnum : return "SMBhenning";
                 case SurfaceforcingsIspddEnum : return "SurfaceforcingsIspdd";
                 case SurfaceforcingsIssmbgradientsEnum : return "SurfaceforcingsIssmbgradients";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -307 +307 @@
               else if (strcmp(name,"SurfaceforcingsBPos")==0) return SurfaceforcingsBPosEnum;
               else if (strcmp(name,"SurfaceforcingsBNeg")==0) return SurfaceforcingsBNegEnum;
+              else if (strcmp(name,"SMBhenning")==0) return SMBhenningEnum;
               else if (strcmp(name,"SurfaceforcingsIspdd")==0) return SurfaceforcingsIspddEnum;
               else if (strcmp(name,"SurfaceforcingsIssmbgradients")==0) return SurfaceforcingsIssmbgradientsEnum;
@@ -382 +383 @@
               else if (strcmp(name,"AdolcParam")==0) return AdolcParamEnum;
               else if (strcmp(name,"BoolInput")==0) return BoolInputEnum;
-              else if (strcmp(name,"BoolParam")==0) return BoolParamEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"Contour")==0) return ContourEnum;
+              if (strcmp(name,"BoolParam")==0) return BoolParamEnum;
+              else if (strcmp(name,"Contour")==0) return ContourEnum;
               else if (strcmp(name,"ControlInput")==0) return ControlInputEnum;
               else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum;
@@ -505 +506 @@
               else if (strcmp(name,"EnthalpyPicard")==0) return EnthalpyPicardEnum;
               else if (strcmp(name,"ThicknessAbsGradient")==0) return ThicknessAbsGradientEnum;
-              else if (strcmp(name,"ThicknessAlongGradient")==0) return ThicknessAlongGradientEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"ThicknessAcrossGradient")==0) return ThicknessAcrossGradientEnum;
+              if (strcmp(name,"ThicknessAlongGradient")==0) return ThicknessAlongGradientEnum;
+              else if (strcmp(name,"ThicknessAcrossGradient")==0) return ThicknessAcrossGradientEnum;
               else if (strcmp(name,"IntMatParam")==0) return IntMatParamEnum;
               else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum;
@@ -628 +629 @@
               else if (strcmp(name,"TriangleInterp")==0) return TriangleInterpEnum;
               else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum;
-              else if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"XY")==0) return XYEnum;
+              if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum;
+              else if (strcmp(name,"XY")==0) return XYEnum;
               else if (strcmp(name,"XYZ")==0) return XYZEnum;
               else if (strcmp(name,"Dense")==0) return DenseEnum;