Changeset 5227

Timestamp:

08/13/10 09:39:36 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added EnumToModelField.cpp Synchronization

Location:

issm/trunk/src/c/EnumDefinitions

Files:

• EnumToModelField.cpp (modified) (1 diff)
• EnumToString.cpp (modified) (1 diff)
• README (modified) (1 diff)
• StringToEnum.cpp (modified) (1 diff)
• Synchronize.sh (modified) (7 diffs)

issm/trunk/src/c/EnumDefinitions/EnumToModelField.cpp

@@ -15 +15 @@
                 case ThicknessEnum : return "thickness";
                 case DragCoefficientEnum : return "drag_coefficient";
-                default : return "unknown";
+                default : return ISSMERROR("No model field is associated to enum %s",EnumToString(en));
         }
 }

issm/trunk/src/c/EnumDefinitions/EnumToString.cpp

@@ -4 +4 @@
 *
 *   WARNING: DO NOT MODIFY THIS FILE
-*            this file has been automatically generated by SynchronizeStrings.sh
+*            this file has been automatically generated by Synchronize.sh
 *            Please read README for more information
 */

issm/trunk/src/c/EnumDefinitions/README

@@ -4 +4 @@
 - EnumToString.cpp
 - src/m/enum/*
-all these files are automatically synchronized with EnumDefinitions.h
+all these files are automatically synchronized with EnumDefinitions.h and EnumToModelField.cpp
 
 TO ADD AN ENUM:
 add the corresponding lines to EnumDefinitions.h
-and executes the 2 synchronizing scripts.
-
-SYNCHRONIZEMATLABENUM
-This script synchronizes all matlab enums from EnumDefinitions.h
-
-SYNCHRONIZESTRINGS
-This scrpit synchronizes StringToEnum.cpp and EnumToString.cpp according to EnumDefinitions.h
+and execute synchronizing script.

issm/trunk/src/c/EnumDefinitions/StringToEnum.cpp

@@ -4 +4 @@
 *
 *   WARNING: DO NOT MODIFY THIS FILE
-*            this file has been automatically generated by SynchronizeStrings.sh
+*            this file has been automatically generated by Synchronize.sh
 *            Please read README for more information
 */

issm/trunk/src/c/EnumDefinitions/Synchronize.sh

@@ -1 +1 @@
 #!/bin/bash
 #Synchronize EnumToString.cpp and StringToEnum.cpp
+
 
 #first remove existing files
@@ -6 +7 @@
 rm $ISSM_DIR/src/m/enum/*.m
 
-echo "Synchronizing EnumToString..."
+echo "Synchronizing Enums..."
+
+#Take care of EnumToModelField.m first (easy)
+#Build EnumToModelField.m {{{1
+cat <<END > EnumToModelField.m
+function string=EnumToModelField(enum)
+%ENUMTOMODELFIELD - output string of model field associated to enum
+%
+%   WARNING: DO NOT MODIFY THIS FILE
+%            this file has been automatically generated by src/c/Synchronize.sh
+%            Please read src/c/README for more information
+%
+%   Usage:
+%      string=EnumToModelField(enum)
+
+switch enum,
+
+END
+
+cat EnumToModelField.cpp | grep "case" | sed -e "s/Enum/Enum()/g" -e "s/\"/'/g" >> EnumToModelField.m
+
+cat <<END >> EnumToModelField.m
+otherwise, error(['Enum ' num2str(enum)  ' not found associated to any model field']);
+
+end
+END
+#}}}
+
 #Get all lines of EnumDefinitions2.h which hold Enum | remove all comas | add line number in the first column > put everything in file temp
 cat EnumDefinitions.h | grep -e "[0-9]Enum" -e "[Aa-Zz]Enum" | grep -v StringToEnum | sed -e "s/,//g" | awk '{ printf "%s %s\n", NR, $0 }' > temp
@@ -17 +45 @@
 *
 *   WARNING: DO NOT MODIFY THIS FILE
-*            this file has been automatically generated by SynchronizeStrings.sh
+*            this file has been automatically generated by Synchronize.sh
 *            Please read README for more information
 */
@@ -38 +66 @@
 *
 *   WARNING: DO NOT MODIFY THIS FILE
-*            this file has been automatically generated by SynchronizeStrings.sh
+*            this file has been automatically generated by Synchronize.sh
 *            Please read README for more information
 */
@@ -56 +84 @@
 %
 %   WARNING: DO NOT MODIFY THIS FILE
-%            this file has been automatically generated by src/c/SynchronizeMatlabEnum
+%            this file has been automatically generated by src/c/Synchronize.sh
 %            Please read src/c/README for more information
 %
@@ -72 +100 @@
 %
 %   WARNING: DO NOT MODIFY THIS FILE
-%            this file has been automatically generated by src/c/SynchronizeMatlabEnum
+%            this file has been automatically generated by src/c/Synchronize.sh
 %            Please read src/c/README for more information
 %
@@ -198 +226 @@
 mv StringToEnum.m         $ISSM_DIR/src/m/enum/
 mv EnumToString.m         $ISSM_DIR/src/m/enum/
+mv EnumToModelField.m     $ISSM_DIR/src/m/enum/
 #}}}
 #clean up{{{