Changeset 9401

Timestamp:

08/24/11 09:36:56 (14 years ago)

Author:

Mathieu Morlighem

Message:

moved GroundingLine to Groundingline

Location:

issm/trunk/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (2 diffs)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (2 diffs)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (2 diffs)
• c/solutions/CorePointerFromSolutionEnum.cpp (modified) (1 diff)
• c/solutions/SolutionConfiguration.cpp (modified) (1 diff)
• c/solutions/groundinglinemigration2d_core.cpp (modified) (1 diff)
• m/classes/model.m (modified) (2 diffs)
• m/enum/GroundingLineMeltingRateEnum.m (deleted)
• m/enum/GroundingLineMigration2DSolutionEnum.m (deleted)
• m/enum/GroundinglineMeltingRateEnum.m (added)
• m/enum/GroundinglineMigration2DSolutionEnum.m (added)
• m/model/ismodelselfconsistent.m (modified) (1 diff)
• m/model/process_solve_options.m (modified) (1 diff)
• m/model/solve.m (modified) (1 diff)
• m/solutions/CorePointerFromSolutionEnum.m (modified) (1 diff)
• m/solutions/SolutionConfiguration.m (modified) (1 diff)

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

@@ -50 +50 @@
         //transient
         TransientSolutionEnum,
-        GroundingLineMigration2DSolutionEnum,
+        GroundinglineMigration2DSolutionEnum,
         SteadyAnalysisEnum,
         TransientAnalysisEnum, // needed by nighly run (to be removed at some point?)
@@ -222 +222 @@
         Fake6Enum,
         MeltingOffsetEnum,
-        GroundingLineMeltingRateEnum,
+        GroundinglineMeltingRateEnum,
         BasalMeltingRateEnum,
         MisfitEnum,

issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -45 +45 @@
                 case HydrologyAnalysisEnum : return "HydrologyAnalysis";
                 case TransientSolutionEnum : return "TransientSolution";
-                case GroundingLineMigration2DSolutionEnum : return "GroundingLineMigration2DSolution";
+                case GroundinglineMigration2DSolutionEnum : return "GroundinglineMigration2DSolution";
                 case SteadyAnalysisEnum : return "SteadyAnalysis";
                 case TransientAnalysisEnum : return "TransientAnalysis";
@@ -190 +190 @@
                 case Fake6Enum : return "Fake6";
                 case MeltingOffsetEnum : return "MeltingOffset";
-                case GroundingLineMeltingRateEnum : return "GroundingLineMeltingRate";
+                case GroundinglineMeltingRateEnum : return "GroundinglineMeltingRate";
                 case BasalMeltingRateEnum : return "BasalMeltingRate";
                 case MisfitEnum : return "Misfit";

issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -43 +43 @@
         else if (strcmp(name,"HydrologyAnalysis")==0) return HydrologyAnalysisEnum;
         else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;
-        else if (strcmp(name,"GroundingLineMigration2DSolution")==0) return GroundingLineMigration2DSolutionEnum;
+        else if (strcmp(name,"GroundinglineMigration2DSolution")==0) return GroundinglineMigration2DSolutionEnum;
         else if (strcmp(name,"SteadyAnalysis")==0) return SteadyAnalysisEnum;
         else if (strcmp(name,"TransientAnalysis")==0) return TransientAnalysisEnum;
@@ -188 +188 @@
         else if (strcmp(name,"Fake6")==0) return Fake6Enum;
         else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum;
-        else if (strcmp(name,"GroundingLineMeltingRate")==0) return GroundingLineMeltingRateEnum;
+        else if (strcmp(name,"GroundinglineMeltingRate")==0) return GroundinglineMeltingRateEnum;
         else if (strcmp(name,"BasalMeltingRate")==0) return BasalMeltingRateEnum;
         else if (strcmp(name,"Misfit")==0) return MisfitEnum;

issm/trunk/src/c/solutions/CorePointerFromSolutionEnum.cpp

@@ -52 +52 @@
                         solutioncore=&transient_core;
                         break;
-                case GroundingLineMigration2DSolutionEnum:
+                case GroundinglineMigration2DSolutionEnum:
                         solutioncore=&groundinglinemigration2d_core;
                         break;

issm/trunk/src/c/solutions/SolutionConfiguration.cpp

@@ -111 +111 @@
                         break;
                 
-                case GroundingLineMigration2DSolutionEnum:
+                case GroundinglineMigration2DSolutionEnum:
                         numanalyses=2;
                         analyses=(int*)xmalloc(numanalyses*sizeof(int));

issm/trunk/src/c/solutions/groundinglinemigration2d_core.cpp

@@ -27 +27 @@
         GroundingLineMigrationx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
 
-        if(solution_type==GroundingLineMigration2DSolutionEnum){
+        if(solution_type==GroundinglineMigration2DSolutionEnum){
                 _printf_(VerboseSolution(),"%s\n","   saving results\n");
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ElementOnIceShelfEnum);

issm/trunk/src/m/classes/model.m

@@ -262 +262 @@
                  temperature                         = {NaN,true,'DoubleMat',1}; %temperature solution vector
                  waterfraction                       = {NaN,true,'DoubleMat',1};
-                 gl_melting_rate                     = {NaN,true,'Double'};
+                 groundingline_melting_rate                     = {NaN,true,'Double'};
                  basal_melting_rate                  = {NaN,true,'DoubleMat',1};
                  basal_melting_rate_correction       = {NaN,true,'DoubleMat',1};
@@ -633 +633 @@
 
                          %basal melting rate correction: 
-                         md.gl_melting_rate=0; 
+                         md.groundingline_melting_rate=0; 
                          md.basal_melting_rate_correction_apply=0; %do not apply
 

issm/trunk/src/m/model/ismodelselfconsistent.m

@@ -332 +332 @@
 %}}}
 %GROUNDINGLINEMIGRATION2D{{{1
-if md.solution_type==GroundingLineMigration2DSolutionEnum,
+if md.solution_type==GroundinglineMigration2DSolutionEnum,
         if strcmpi(md.cluster.name,'none'),
                 message(['model not consistent: ' md.solution_type ' is only implemented in parallel mode !'])

issm/trunk/src/m/model/process_solve_options.m

@@ -12 +12 @@
 if ~ismember(solution_type,[DiagnosticSolutionEnum,PrognosticSolutionEnum,ThermalSolutionEnum,...
                 SteadystateSolutionEnum,ParametersSolutionEnum,TransientSolutionEnum,EnthalpySolutionEnum,...
-                BalancethicknessSolutionEnum,BedSlopeSolutionEnum,SurfaceSlopeSolutionEnum,GroundingLineMigration2DSolutionEnum,HydrologySolutionEnum,FlaimSolutionEnum]),
+                BalancethicknessSolutionEnum,BedSlopeSolutionEnum,SurfaceSlopeSolutionEnum,GroundinglineMigration2DSolutionEnum,HydrologySolutionEnum,FlaimSolutionEnum]),
         error(['process_solve_options error message: solution_type ' EnumToString(solution_type) ' not supported yet!']);
 end

issm/trunk/src/m/model/solve.m

@@ -7 +7 @@
 %
 %   solution types available comprise:
-%                DiagnosticSolutionEnum
-%                PrognosticSolutionEnum
-%                ThermalSolutionEnum
-%                SteadystateSolutionEnum
-%                ParametersSolutionEnum
-%                TransientSolutionEnum...
-%                BalancethicknessSolutionEnum
-%                BedSlopeSolutionEnum
-%                SurfaceSlopeSolutionEnum
-%                GroundingLineMigration2DSolutionEnum
-%                HydrologySolutionEnum
-%                FlaimSolutionEnum
+%                - DiagnosticSolutionEnum
+%                - PrognosticSolutionEnum
+%                - ThermalSolutionEnum
+%                - SteadystateSolutionEnum
+%                - ParametersSolutionEnum
+%                - TransientSolutionEnum...
+%                - BalancethicknessSolutionEnum
+%                - BedSlopeSolutionEnum
+%                - SurfaceSlopeSolutionEnum
+%                - GroundinglineMigration2DSolutionEnum
+%                - HydrologySolutionEnum
+%                - FlaimSolutionEnum
 %
 %   Examples:

issm/trunk/src/m/solutions/CorePointerFromSolutionEnum.m

@@ -17 +17 @@
         case TransientSolutionEnum,                solutioncore='transient_core';
         case FlaimSolutionEnum,                    solutioncore='flaim_core';
-        case GroundingLineMigration2DSolutionEnum, solutioncore='DUMMYDUMMY'; %not working in serial mode
+        case GroundinglineMigration2DSolutionEnum, solutioncore='DUMMYDUMMY'; %not working in serial mode
         case HydrologySolutionEnum,                solutioncore='DUMMYDUMMY'; %not working in serial mode
         otherwise error('%s%s%s',' solution type: ',EnumToString(solutiontype),' not supported yet!');

issm/trunk/src/m/solutions/SolutionConfiguration.m

@@ -50 +50 @@
                 analyses=[FlaimAnalysisEnum];
 
-        case GroundingLineMigration2DSolutionEnum,
+        case GroundinglineMigration2DSolutionEnum,
                 numanalyses=0; 
                 analyses=[];