Changeset 5356

Timestamp:

08/18/10 10:13:11 (15 years ago)

Author:

Mathieu Morlighem

Message:

Synchronized enums

Location:

issm/trunk/src/m/enum

Files:

• EnumToModelField.m (modified) (1 diff)
• EnumToString.m (modified) (1 diff)
• RheologyB2dEnum.m (deleted)
• RheologyBbarEnum.m (added)
• StringToEnum.m (modified) (1 diff)

issm/trunk/src/m/enum/EnumToModelField.m

@@ -14 +14 @@
                 case DragCoefficientEnum(), string='drag_coefficient'; return
                 case RheologyBEnum(), string='rheology_B'; return
-                case RheologyB2dEnum(), string='rheology_B'; return
+                case RheologyBbarEnum(), string='rheology_B'; return
                 otherwise, error(['Enum ' num2str(enum)  ' not found associated to any model field']);
 

issm/trunk/src/m/enum/EnumToString.m

@@ -190 +190 @@
 case ResetPenaltiesEnum(), string='ResetPenalties'; return
 case RheologyBEnum(), string='RheologyB'; return
-case RheologyB2dEnum(), string='RheologyB2d'; return
+case RheologyBbarEnum(), string='RheologyBbar'; return
 case RheologyNEnum(), string='RheologyN'; return
 case SegmentOnIceShelfEnum(), string='SegmentOnIceShelf'; return

issm/trunk/src/m/enum/StringToEnum.m

@@ -188 +188 @@
                         elseif (strcmpi(name,'ResetPenalties')), enum=ResetPenaltiesEnum(); return
                         elseif (strcmpi(name,'RheologyB')), enum=RheologyBEnum(); return
-                        elseif (strcmpi(name,'RheologyB2d')), enum=RheologyB2dEnum(); return
+                        elseif (strcmpi(name,'RheologyBbar')), enum=RheologyBbarEnum(); return
                         elseif (strcmpi(name,'RheologyN')), enum=RheologyNEnum(); return
                         elseif (strcmpi(name,'SegmentOnIceShelf')), enum=SegmentOnIceShelfEnum(); return