Changeset 15339

Timestamp:

06/27/13 09:18:19 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: renamed WeakBalancethickness -> BalancethicknessSoft as this is a soft constraint

Location:

issm/trunk-jpl/src

Files:

• c/analyses/AdjointCorePointerFromSolutionEnum.cpp (modified) (1 diff)
• c/analyses/AnalysisConfiguration.cpp (modified) (1 diff)
• c/analyses/CorePointerFromSolutionEnum.cpp (modified) (1 diff)
• c/analyses/objectivefunction.cpp (modified) (2 diffs)
• c/classes/Elements/Tria.cpp (modified) (3 diffs)
• c/classes/Elements/Tria.h (modified) (1 diff)
• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (1 diff)
• m/classes/inversion.m (modified) (1 diff)
• m/classes/taoinversion.m (modified) (1 diff)
• m/consistency/ismodelselfconsistent.m (modified) (1 diff)
• m/enum/BalancethicknessSoftAnalysisEnum.m (added)
• m/enum/BalancethicknessSoftSolutionEnum.m (added)
• m/enum/EnumDefinitions.py (modified) (1 diff)
• m/enum/WeakBalancethicknessAnalysisEnum.m (deleted)
• m/enum/WeakBalancethicknessSolutionEnum.m (deleted)
• m/solve/process_solve_options.m (modified) (1 diff)

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

@@ -32 +32 @@
                         adjointcore=&adjointbalancethickness_core;
                         break;
-                case WeakBalancethicknessSolutionEnum:
+                case BalancethicknessSoftSolutionEnum:
                         adjointcore=&dummy_core;
                         break;

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

@@ -83 +83 @@
                         break;
 
-                case WeakBalancethicknessSolutionEnum:
+                case BalancethicknessSoftSolutionEnum:
                         numanalyses=1;
                         analyses=xNew<int>(numanalyses);

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

@@ -58 +58 @@
                         #endif
                         break;
-                case WeakBalancethicknessSolutionEnum:
+                case BalancethicknessSoftSolutionEnum:
                         #ifdef _HAVE_BALANCED_
                         solutioncore=&dummy_core;

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

@@ -43 +43 @@
                 femmodel->SetCurrentConfiguration(BalancethicknessAnalysisEnum);
         }
-        else if (solution_type==WeakBalancethicknessSolutionEnum){
+        else if (solution_type==BalancethicknessSoftSolutionEnum){
                 femmodel->SetCurrentConfiguration(BalancethicknessAnalysisEnum);
         }
@@ -63 +63 @@
                 solutionsequence_linear(femmodel); 
         }
-        else if (solution_type==WeakBalancethicknessSolutionEnum){
+        else if (solution_type==BalancethicknessSoftSolutionEnum){
                 /*Don't do anything*/
         }

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -3887 +3887 @@
                 vy_input->GetInputDerivativeValue(&dvy[0],&xyz_list[0][0],gauss);
 
-                /*Weak balance thickness J = 1/2 (div(Hv)-a)^2*/
+                /*Balance thickness soft constraint J = 1/2 (div(Hv)-a)^2*/
                 temp  = vx*dH[0]+vy*dH[1]+H*(dvx[0]+dvy[1]) - (surface_mass_balance-basal_melting-dhdt);
                 Jelem+=weight*1/2*temp*temp*Jdet*gauss->weight;
@@ -4019 +4019 @@
                         break;
                 case ThicknessEnum:
-                        GradjThicknessWeakBalancedthickness(gradient,control_index);
+                        GradjThicknessBalancethicknessSoft(gradient,control_index);
                         break;
                 default:
@@ -4486 +4486 @@
 }
 /*}}}*/
-/*FUNCTION Tria::GradjThicknessWeakBalancedthickness{{{*/
-void  Tria::GradjThicknessWeakBalancedthickness(Vector<IssmDouble>* gradient,int control_index){
+/*FUNCTION Tria::GradjThicknessBalancethicknessSoft{{{*/
+void  Tria::GradjThicknessBalancethicknessSoft(Vector<IssmDouble>* gradient,int control_index){
 
         /*Intermediaries */

issm/trunk-jpl/src/c/classes/Elements/Tria.h

@@ -157 +157 @@
                 void   GradjVxBalancedthickness(Vector<IssmDouble>* gradient,int control_index);
                 void   GradjVyBalancedthickness(Vector<IssmDouble>* gradient,int control_index);
-                void   GradjThicknessWeakBalancedthickness(Vector<IssmDouble>* gradient,int control_index);
+                void   GradjThicknessBalancethicknessSoft(Vector<IssmDouble>* gradient,int control_index);
                 void   GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data);
                 void   SetControlInputsFromVector(IssmDouble* vector,int control_enum,int control_index);

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

@@ -273 +273 @@
         BalancethicknessAnalysisEnum,
         BalancethicknessSolutionEnum,
-        WeakBalancethicknessAnalysisEnum,
-        WeakBalancethicknessSolutionEnum,
+        BalancethicknessSoftAnalysisEnum,
+        BalancethicknessSoftSolutionEnum,
         BedSlopeAnalysisEnum,
         BedSlopeSolutionEnum,

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

@@ -279 +279 @@
                 case BalancethicknessAnalysisEnum : return "BalancethicknessAnalysis";
                 case BalancethicknessSolutionEnum : return "BalancethicknessSolution";
-                case WeakBalancethicknessAnalysisEnum : return "WeakBalancethicknessAnalysis";
-                case WeakBalancethicknessSolutionEnum : return "WeakBalancethicknessSolution";
+                case BalancethicknessSoftAnalysisEnum : return "BalancethicknessSoftAnalysis";
+                case BalancethicknessSoftSolutionEnum : return "BalancethicknessSoftSolution";
                 case BedSlopeAnalysisEnum : return "BedSlopeAnalysis";
                 case BedSlopeSolutionEnum : return "BedSlopeSolution";

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

@@ -285 +285 @@
               else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum;
               else if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum;
-              else if (strcmp(name,"WeakBalancethicknessAnalysis")==0) return WeakBalancethicknessAnalysisEnum;
-              else if (strcmp(name,"WeakBalancethicknessSolution")==0) return WeakBalancethicknessSolutionEnum;
+              else if (strcmp(name,"BalancethicknessSoftAnalysis")==0) return BalancethicknessSoftAnalysisEnum;
+              else if (strcmp(name,"BalancethicknessSoftSolution")==0) return BalancethicknessSoftSolutionEnum;
               else if (strcmp(name,"BedSlopeAnalysis")==0) return BedSlopeAnalysisEnum;
               else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum;

issm/trunk-jpl/src/m/classes/inversion.m

@@ -124 +124 @@
                         if solution==BalancethicknessSolutionEnum()
                                 md = checkfield(md,'inversion.thickness_obs','size',[md.mesh.numberofvertices 1],'NaN',1);
-                        elseif solution==WeakBalancethicknessSolutionEnum()
+                        elseif solution==BalancethicknessSoftSolutionEnum()
                                 md = checkfield(md,'inversion.thickness_obs','size',[md.mesh.numberofvertices 1],'NaN',1);
                         else

issm/trunk-jpl/src/m/classes/taoinversion.m

@@ -83 +83 @@
                         if solution==BalancethicknessSolutionEnum()
                                 md = checkfield(md,'inversion.thickness_obs','size',[md.mesh.numberofvertices 1],'NaN',1);
-                        elseif solution==WeakBalancethicknessSolutionEnum()
+                        elseif solution==BalancethicknessSoftSolutionEnum()
                                 md = checkfield(md,'inversion.thickness_obs','size',[md.mesh.numberofvertices 1],'NaN',1);
                         else

issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m

@@ -69 +69 @@
                 analyses=[BalancethicknessAnalysisEnum()];
 
-        case WeakBalancethicknessSolutionEnum(),
+        case BalancethicknessSoftSolutionEnum(),
                 numanalyses=1; 
                 analyses=[BalancethicknessAnalysisEnum()];

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -3677 +3677 @@
         return StringToEnum('BalancethicknessSolution')[0]
 
-def WeakBalancethicknessAnalysisEnum():
-        """
-        WEAKBALANCETHICKNESSANALYSISENUM - Enum of WeakBalancethicknessAnalysis
-
-        WARNING: DO NOT MODIFY THIS FILE
-                                this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
-                                Please read src/c/shared/Enum/README for more information
-
-           Usage:
-              macro=WeakBalancethicknessAnalysisEnum()
-        """
-
-        return StringToEnum('WeakBalancethicknessAnalysis')[0]
-
-def WeakBalancethicknessSolutionEnum():
-        """
-        WEAKBALANCETHICKNESSSOLUTIONENUM - Enum of WeakBalancethicknessSolution
-
-        WARNING: DO NOT MODIFY THIS FILE
-                                this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
-                                Please read src/c/shared/Enum/README for more information
-
-           Usage:
-              macro=WeakBalancethicknessSolutionEnum()
-        """
-
-        return StringToEnum('WeakBalancethicknessSolution')[0]
+def BalancethicknessSoftAnalysisEnum():
+        """
+        BALANCETHICKNESSSOFTANALYSISENUM - Enum of BalancethicknessSoftAnalysis
+
+        WARNING: DO NOT MODIFY THIS FILE
+                                this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
+                                Please read src/c/shared/Enum/README for more information
+
+           Usage:
+              macro=BalancethicknessSoftAnalysisEnum()
+        """
+
+        return StringToEnum('BalancethicknessSoftAnalysis')[0]
+
+def BalancethicknessSoftSolutionEnum():
+        """
+        BALANCETHICKNESSSOFTSOLUTIONENUM - Enum of BalancethicknessSoftSolution
+
+        WARNING: DO NOT MODIFY THIS FILE
+                                this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
+                                Please read src/c/shared/Enum/README for more information
+
+           Usage:
+              macro=BalancethicknessSoftSolutionEnum()
+        """
+
+        return StringToEnum('BalancethicknessSoftSolution')[0]
 
 def BedSlopeAnalysisEnum():

issm/trunk-jpl/src/m/solve/process_solve_options.m

@@ -11 +11 @@
 if ~ismember(solution_type,[DiagnosticSolutionEnum(),PrognosticSolutionEnum(),ThermalSolutionEnum(),...
                 SteadystateSolutionEnum(),TransientSolutionEnum(),EnthalpySolutionEnum(),...
-                BalancethicknessSolutionEnum(),WeakBalancethicknessSolutionEnum(),BedSlopeSolutionEnum(),...
+                BalancethicknessSolutionEnum(),BalancethicknessSoftSolutionEnum(),BedSlopeSolutionEnum(),...
                 SurfaceSlopeSolutionEnum(),HydrologySolutionEnum(),FlaimSolutionEnum(),GiaSolutionEnum()]),
         error(['process_solve_options error message: solution_type ' EnumToString(solution_type) ' not supported yet!']);