Index: /issm/trunk-jpl/src/c/classes/Elements/Element.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 17940) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 17941) @@ -744,5 +744,5 @@ else shelf=false; } - else if(migration_style==NoneEnum || migration_style==AgressiveMigrationEnum || migration_style==SoftMigrationEnum){ //Floating if all nodes are floating + else if(migration_style==NoneEnum || migration_style==AggressiveMigrationEnum || migration_style==SoftMigrationEnum){ //Floating if all nodes are floating if(this->inputs->Min(MaskGroundediceLevelsetEnum) > 0.) shelf=false; else shelf=true; Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 17940) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 17941) @@ -3961,10 +3961,10 @@ } /*Ice sheet: if hydrostatic bed above bathymetry, ice sheet starts to unground, elso do nothing */ - /*Change only if AgressiveMigration or if the ice sheet is in contact with the ocean*/ + /*Change only if AggressiveMigration or if the ice sheet is in contact with the ocean*/ else{ bed_hydro=-density*h[i]; if(bed_hydro>r[i]){ /*Unground only if the element is connected to the ice shelf*/ - if(migration_style==AgressiveMigrationEnum || migration_style==SubelementMigrationEnum || migration_style==SubelementMigration2Enum){ + if(migration_style==AggressiveMigrationEnum || migration_style==SubelementMigrationEnum || migration_style==SubelementMigration2Enum){ s[i] = (1-density)*h[i]; b[i] = -density*h[i]; Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17940) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17941) @@ -4406,10 +4406,10 @@ } /*Ice sheet: if hydrostatic bed above bathymetry, ice sheet starts to unground, elso do nothing */ - /*Change only if AgressiveMigration or if the ice sheet is in contact with the ocean*/ + /*Change only if AggressiveMigration or if the ice sheet is in contact with the ocean*/ else{ // phi>0 bed_hydro=-density*h[i]; if (bed_hydro>r[i]){ /*Unground only if the element is connected to the ice shelf*/ - if(migration_style==AgressiveMigrationEnum || migration_style==SubelementMigrationEnum || migration_style==SubelementMigration2Enum){ + if(migration_style==AggressiveMigrationEnum || migration_style==SubelementMigrationEnum || migration_style==SubelementMigration2Enum){ s[i] = (1-density)*h[i]; b[i] = -density*h[i]; Index: /issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (revision 17940) +++ /issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (revision 17941) @@ -36,5 +36,5 @@ phi_ungrounding=ContactFSLevelset(elements,vertices); break; - case AgressiveMigrationEnum: + case AggressiveMigrationEnum: case SubelementMigrationEnum: case SubelementMigration2Enum: Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 17940) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 17941) @@ -650,5 +650,5 @@ /*Grounding Line{{{*/ NoneEnum, - AgressiveMigrationEnum, + AggressiveMigrationEnum, SoftMigrationEnum, SubelementMigrationEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 17940) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 17941) @@ -629,5 +629,5 @@ case AugmentedLagrangianThetaEnum : return "AugmentedLagrangianTheta"; case NoneEnum : return "None"; - case AgressiveMigrationEnum : return "AgressiveMigration"; + case AggressiveMigrationEnum : return "AggressiveMigration"; case SoftMigrationEnum : return "SoftMigration"; case SubelementMigrationEnum : return "SubelementMigration"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 17940) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 17941) @@ -644,5 +644,5 @@ else if (strcmp(name,"AugmentedLagrangianTheta")==0) return AugmentedLagrangianThetaEnum; else if (strcmp(name,"None")==0) return NoneEnum; - else if (strcmp(name,"AgressiveMigration")==0) return AgressiveMigrationEnum; + else if (strcmp(name,"AggressiveMigration")==0) return AggressiveMigrationEnum; else if (strcmp(name,"SoftMigration")==0) return SoftMigrationEnum; else if (strcmp(name,"SubelementMigration")==0) return SubelementMigrationEnum; Index: /issm/trunk-jpl/src/m/classes/groundingline.m =================================================================== --- /issm/trunk-jpl/src/m/classes/groundingline.m (revision 17940) +++ /issm/trunk-jpl/src/m/classes/groundingline.m (revision 17941) @@ -18,5 +18,5 @@ % migration (SoftMigration, AggressiveMigration, or None)drop-down - fprintf(fid,'%s\n%s\n%s\n%s\n','','
',' type of grounding line migration: "SoftMigration","AgressiveMigration" or "None" '); + fprintf(fid,'%s\n%s\n%s\n%s\n','','
',' type of grounding line migration: "SoftMigration","AggressiveMigration" or "None" '); fprintf(fid,'%s\n',' '); fprintf(fid,'%s\n',' '); @@ -45,5 +45,5 @@ function md = checkconsistency(obj,md,solution,analyses) % {{{ - md = checkfield(md,'fieldname','groundingline.migration','values',{'None' 'AgressiveMigration' 'SoftMigration' 'SubelementMigration' 'SubelementMigration2' 'Contact' 'None'}); + md = checkfield(md,'fieldname','groundingline.migration','values',{'None' 'AggressiveMigration' 'SoftMigration' 'SubelementMigration' 'SubelementMigration2' 'Contact' 'None'}); if ~strcmp(obj.migration,'None'), @@ -63,5 +63,5 @@ function disp(obj) % {{{ disp(sprintf(' grounding line migration parameters:')); - fielddisplay(obj,'migration','type of grounding line migration: ''SoftMigration'',''AgressiveMigration'' or ''None'''); + fielddisplay(obj,'migration','type of grounding line migration: ''SoftMigration'',''AggressiveMigration'' or ''None'''); fielddisplay(obj,'melting_rate','melting rate applied when previously grounded parts start floating [m/yr]'); Index: /issm/trunk-jpl/src/m/classes/groundingline.py =================================================================== --- /issm/trunk-jpl/src/m/classes/groundingline.py (revision 17940) +++ /issm/trunk-jpl/src/m/classes/groundingline.py (revision 17941) @@ -26,5 +26,5 @@ string=' grounding line migration parameters:' - string="%s\n%s"%(string,fielddisplay(self,'migration','type of grounding line migration: ''SoftMigration'',''AgressiveMigration'',''SubelementMigration'',''SubelementMigration2'',''Contact'',''None''')) + string="%s\n%s"%(string,fielddisplay(self,'migration','type of grounding line migration: ''SoftMigration'',''AggressiveMigration'',''SubelementMigration'',''SubelementMigration2'',''Contact'',''None''')) string="%s\n%s"%(string,fielddisplay(self,'melting_rate','melting rate applied when previously grounded parts start floating [m/yr]')) return string @@ -42,5 +42,5 @@ def checkconsistency(self,md,solution,analyses): # {{{ - md = checkfield(md,'fieldname','groundingline.migration','values',['None','AgressiveMigration','SoftMigration','SubelementMigration','SubelementMigration2','Contact']) + md = checkfield(md,'fieldname','groundingline.migration','values',['None','AggressiveMigration','SoftMigration','SubelementMigration','SubelementMigration2','Contact']) if not m.strcmp(self.migration,'None'): Index: /issm/trunk-jpl/src/m/classes/model.m =================================================================== --- /issm/trunk-jpl/src/m/classes/model.m (revision 17940) +++ /issm/trunk-jpl/src/m/classes/model.m (revision 17941) @@ -1017,5 +1017,5 @@ if isfield(structmd,'groundingline_migration') & isnumeric(structmd.groundingline_migration), if (structmd.groundingline_migration==272), md.groundingline.migration='None'; end - if (structmd.groundingline_migration==273), md.groundingline.migration='AgressiveMigration'; end + if (structmd.groundingline_migration==273), md.groundingline.migration='AggressiveMigration'; end if (structmd.groundingline_migration==274), md.groundingline.migration='SoftMigration'; end end Index: /issm/trunk-jpl/src/m/enum/AggressiveMigrationEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/AggressiveMigrationEnum.m (revision 17941) +++ /issm/trunk-jpl/src/m/enum/AggressiveMigrationEnum.m (revision 17941) @@ -0,0 +1,11 @@ +function macro=AggressiveMigrationEnum() +%AGGRESSIVEMIGRATIONENUM - Enum of AggressiveMigration +% +% 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=AggressiveMigrationEnum() + +macro=StringToEnum('AggressiveMigration'); Index: sm/trunk-jpl/src/m/enum/AgressiveMigrationEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/AgressiveMigrationEnum.m (revision 17940) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=AgressiveMigrationEnum() -%AGRESSIVEMIGRATIONENUM - Enum of AgressiveMigration -% -% 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=AgressiveMigrationEnum() - -macro=StringToEnum('AgressiveMigration'); Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py =================================================================== --- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 17940) +++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 17941) @@ -621,5 +621,5 @@ def AugmentedLagrangianThetaEnum(): return StringToEnum("AugmentedLagrangianTheta")[0] def NoneEnum(): return StringToEnum("None")[0] -def AgressiveMigrationEnum(): return StringToEnum("AgressiveMigration")[0] +def AggressiveMigrationEnum(): return StringToEnum("AggressiveMigration")[0] def SoftMigrationEnum(): return StringToEnum("SoftMigration")[0] def SubelementMigrationEnum(): return StringToEnum("SubelementMigration")[0]