Changeset 11643

Timestamp:

03/06/12 10:24:30 (13 years ago)

Author:

Mathieu Morlighem

Message:

Trying to get rid of EnumToModelField (does not work anymore)

Location:

issm/trunk-jpl/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/EnumDefinitions/EnumToModelField.cpp (deleted)
• c/EnumDefinitions/README (modified) (1 diff)
• c/EnumDefinitions/Synchronize.sh (modified) (1 diff)
• c/Makefile.am (modified) (1 diff)
• m/model/EnumToModelField.m (moved) (moved from issm/trunk-jpl/src/m/enum/EnumToModelField.m ) (1 diff)

issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h ¶

@@ -480 +480 @@
 };
 
-/*Functions on enums: */
-const char *EnumToModelField(int  en);
-
 #endif

issm/trunk-jpl/src/c/EnumDefinitions/README ¶

@@ -4 +4 @@
 - EnumToStringx.cpp
 - src/m/enum/*
-all these files are automatically synchronized with EnumDefinitions.h and EnumToModelField.cpp
+all these files are automatically synchronized with EnumDefinitions.h
 
 TO ADD AN ENUM:

issm/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh ¶

@@ -13 +13 @@
 NUMENUMS=$(wc -l temp | awk '{printf("%s",$1);}');
 
-#Take care of EnumToModelField.m first (easy)
-#Build EnumToModelField.m {{{1
-cat <<END > $ISSM_TIER/src/m/enum/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/EnumDefinitions/Synchronize.sh
-%            Please read src/c/EnumDefinitions/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" -e "s/return /string=/g" -e "s/;/; return/g" >> $ISSM_TIER/src/m/enum/EnumToModelField.m
-
-cat <<END >> $ISSM_TIER/src/m/enum/EnumToModelField.m
-                otherwise, error(['Enum ' num2str(enum)  ' not found associated to any model field']);
-
-end
-END
-#}}}
 #Build EnumToStringx.cpp {{{1
 #Header

issm/trunk-jpl/src/c/Makefile.am ¶

@@ -253 +253 @@
                                         ./io/PrintfFunction.cpp\
                                         ./EnumDefinitions/EnumDefinitions.h\
-                                        ./EnumDefinitions/EnumToModelField.cpp\
                                         ./modules/ModelProcessorx/ModelProcessorx.h\
                                         ./modules/ModelProcessorx/ModelProcessorx.cpp\

issm/trunk-jpl/src/m/model/EnumToModelField.m ¶

@@ -2 +2 @@
 %ENUMTOMODELFIELD - output string of model field associated to enum
 %
-%   WARNING: DO NOT MODIFY THIS FILE
-%            this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh
-%            Please read src/c/EnumDefinitions/README for more information
-%
 %   Usage:
 %      string=EnumToModelField(enum)
+
+disp('Warning: EnumToModelField is deprecated, it cannot work with new model definition. This function will be removed in the future');
 
 switch enum,