Changeset 17941

Timestamp:

05/05/14 17:15:22 (11 years ago)

Author:

cborstad

Message:

CHG: fixed spelling: Agressive->Aggressive

Location:

issm/trunk-jpl/src

Files:

• c/classes/Elements/Element.cpp (modified) (1 diff)
• c/classes/Elements/Penta.cpp (modified) (1 diff)
• c/classes/Elements/Tria.cpp (modified) (1 diff)
• c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (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/groundingline.m (modified) (3 diffs)
• m/classes/groundingline.py (modified) (2 diffs)
• m/classes/model.m (modified) (1 diff)
• m/enum/AggressiveMigrationEnum.m (added)
• m/enum/AgressiveMigrationEnum.m (deleted)
• m/enum/EnumDefinitions.py (modified) (1 diff)

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

@@ -744 +744 @@
                 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;

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

@@ -3961 +3961 @@
                 }
                 /*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];

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

@@ -4406 +4406 @@
                 }
                 /*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];

issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp

@@ -36 +36 @@
                         phi_ungrounding=ContactFSLevelset(elements,vertices);
                         break;
-                case AgressiveMigrationEnum:
+                case AggressiveMigrationEnum:
                 case SubelementMigrationEnum:
                 case SubelementMigration2Enum:

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

@@ -650 +650 @@
         /*Grounding Line{{{*/
         NoneEnum,
-        AgressiveMigrationEnum,
+        AggressiveMigrationEnum,
         SoftMigrationEnum,
         SubelementMigrationEnum,

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

@@ -629 +629 @@
                 case AugmentedLagrangianThetaEnum : return "AugmentedLagrangianTheta";
                 case NoneEnum : return "None";
-                case AgressiveMigrationEnum : return "AgressiveMigration";
+                case AggressiveMigrationEnum : return "AggressiveMigration";
                 case SoftMigrationEnum : return "SoftMigration";
                 case SubelementMigrationEnum : return "SubelementMigration";

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

@@ -644 +644 @@
               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;

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

@@ -18 +18 @@
                         
             % migration (SoftMigration, AggressiveMigration, or None)drop-down
-            fprintf(fid,'%s\n%s\n%s\n%s\n','<parameter key ="migration" type="alternative" optional="false">','     <section name="groundingline" />','     <help> type of grounding line migration: "SoftMigration","AgressiveMigration" or "None" </help>');
+            fprintf(fid,'%s\n%s\n%s\n%s\n','<parameter key ="migration" type="alternative" optional="false">','     <section name="groundingline" />','     <help> type of grounding line migration: "SoftMigration","AggressiveMigration" or "None" </help>');
             fprintf(fid,'%s\n','       <option value="SoftMigration" type="string" default="true"> </option>');
             fprintf(fid,'%s\n','       <option value="AggressiveMigration" type="string" default="false"> </option>');
@@ -45 +45 @@
                 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 +63 @@
                 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]');
 

issm/trunk-jpl/src/m/classes/groundingline.py

@@ -26 +26 @@
                 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 +42 @@
         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'):

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

@@ -1017 +1017 @@
                         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

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

@@ -621 +621 @@
 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]