Index: /issm/trunk-jpl/src/c/analyses/AdjointCorePointerFromSolutionEnum.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/AdjointCorePointerFromSolutionEnum.cpp (revision 15338) +++ /issm/trunk-jpl/src/c/analyses/AdjointCorePointerFromSolutionEnum.cpp (revision 15339) @@ -32,5 +32,5 @@ adjointcore=&adjointbalancethickness_core; break; - case WeakBalancethicknessSolutionEnum: + case BalancethicknessSoftSolutionEnum: adjointcore=&dummy_core; break; Index: /issm/trunk-jpl/src/c/analyses/AnalysisConfiguration.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/AnalysisConfiguration.cpp (revision 15338) +++ /issm/trunk-jpl/src/c/analyses/AnalysisConfiguration.cpp (revision 15339) @@ -83,5 +83,5 @@ break; - case WeakBalancethicknessSolutionEnum: + case BalancethicknessSoftSolutionEnum: numanalyses=1; analyses=xNew(numanalyses); Index: /issm/trunk-jpl/src/c/analyses/CorePointerFromSolutionEnum.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/CorePointerFromSolutionEnum.cpp (revision 15338) +++ /issm/trunk-jpl/src/c/analyses/CorePointerFromSolutionEnum.cpp (revision 15339) @@ -58,5 +58,5 @@ #endif break; - case WeakBalancethicknessSolutionEnum: + case BalancethicknessSoftSolutionEnum: #ifdef _HAVE_BALANCED_ solutioncore=&dummy_core; Index: /issm/trunk-jpl/src/c/analyses/objectivefunction.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/objectivefunction.cpp (revision 15338) +++ /issm/trunk-jpl/src/c/analyses/objectivefunction.cpp (revision 15339) @@ -43,5 +43,5 @@ femmodel->SetCurrentConfiguration(BalancethicknessAnalysisEnum); } - else if (solution_type==WeakBalancethicknessSolutionEnum){ + else if (solution_type==BalancethicknessSoftSolutionEnum){ femmodel->SetCurrentConfiguration(BalancethicknessAnalysisEnum); } @@ -63,5 +63,5 @@ solutionsequence_linear(femmodel); } - else if (solution_type==WeakBalancethicknessSolutionEnum){ + else if (solution_type==BalancethicknessSoftSolutionEnum){ /*Don't do anything*/ } Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 15338) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 15339) @@ -3887,5 +3887,5 @@ 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,5 +4019,5 @@ break; case ThicknessEnum: - GradjThicknessWeakBalancedthickness(gradient,control_index); + GradjThicknessBalancethicknessSoft(gradient,control_index); break; default: @@ -4486,6 +4486,6 @@ } /*}}}*/ -/*FUNCTION Tria::GradjThicknessWeakBalancedthickness{{{*/ -void Tria::GradjThicknessWeakBalancedthickness(Vector* gradient,int control_index){ +/*FUNCTION Tria::GradjThicknessBalancethicknessSoft{{{*/ +void Tria::GradjThicknessBalancethicknessSoft(Vector* gradient,int control_index){ /*Intermediaries */ Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 15338) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 15339) @@ -157,5 +157,5 @@ void GradjVxBalancedthickness(Vector* gradient,int control_index); void GradjVyBalancedthickness(Vector* gradient,int control_index); - void GradjThicknessWeakBalancedthickness(Vector* gradient,int control_index); + void GradjThicknessBalancethicknessSoft(Vector* gradient,int control_index); void GetVectorFromControlInputs(Vector* gradient,int control_enum,int control_index,const char* data); void SetControlInputsFromVector(IssmDouble* vector,int control_enum,int control_index); Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 15338) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 15339) @@ -273,6 +273,6 @@ BalancethicknessAnalysisEnum, BalancethicknessSolutionEnum, - WeakBalancethicknessAnalysisEnum, - WeakBalancethicknessSolutionEnum, + BalancethicknessSoftAnalysisEnum, + BalancethicknessSoftSolutionEnum, BedSlopeAnalysisEnum, BedSlopeSolutionEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 15338) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 15339) @@ -279,6 +279,6 @@ 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"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 15338) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 15339) @@ -285,6 +285,6 @@ 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; Index: /issm/trunk-jpl/src/m/classes/inversion.m =================================================================== --- /issm/trunk-jpl/src/m/classes/inversion.m (revision 15338) +++ /issm/trunk-jpl/src/m/classes/inversion.m (revision 15339) @@ -124,5 +124,5 @@ 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 Index: /issm/trunk-jpl/src/m/classes/taoinversion.m =================================================================== --- /issm/trunk-jpl/src/m/classes/taoinversion.m (revision 15338) +++ /issm/trunk-jpl/src/m/classes/taoinversion.m (revision 15339) @@ -83,5 +83,5 @@ 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 Index: /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m =================================================================== --- /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m (revision 15338) +++ /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m (revision 15339) @@ -69,5 +69,5 @@ analyses=[BalancethicknessAnalysisEnum()]; - case WeakBalancethicknessSolutionEnum(), + case BalancethicknessSoftSolutionEnum(), numanalyses=1; analyses=[BalancethicknessAnalysisEnum()]; Index: /issm/trunk-jpl/src/m/enum/BalancethicknessSoftAnalysisEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/BalancethicknessSoftAnalysisEnum.m (revision 15339) +++ /issm/trunk-jpl/src/m/enum/BalancethicknessSoftAnalysisEnum.m (revision 15339) @@ -0,0 +1,11 @@ +function macro=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() + +macro=StringToEnum('BalancethicknessSoftAnalysis'); Index: /issm/trunk-jpl/src/m/enum/BalancethicknessSoftSolutionEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/BalancethicknessSoftSolutionEnum.m (revision 15339) +++ /issm/trunk-jpl/src/m/enum/BalancethicknessSoftSolutionEnum.m (revision 15339) @@ -0,0 +1,11 @@ +function macro=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() + +macro=StringToEnum('BalancethicknessSoftSolution'); Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py =================================================================== --- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 15338) +++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 15339) @@ -3677,31 +3677,31 @@ 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(): Index: sm/trunk-jpl/src/m/enum/WeakBalancethicknessAnalysisEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/WeakBalancethicknessAnalysisEnum.m (revision 15338) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=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() - -macro=StringToEnum('WeakBalancethicknessAnalysis'); Index: sm/trunk-jpl/src/m/enum/WeakBalancethicknessSolutionEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/WeakBalancethicknessSolutionEnum.m (revision 15338) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=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() - -macro=StringToEnum('WeakBalancethicknessSolution'); Index: /issm/trunk-jpl/src/m/solve/process_solve_options.m =================================================================== --- /issm/trunk-jpl/src/m/solve/process_solve_options.m (revision 15338) +++ /issm/trunk-jpl/src/m/solve/process_solve_options.m (revision 15339) @@ -11,5 +11,5 @@ 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!']);