Changeset 16560 for issm/trunk/src/c/shared/Enum/Synchronize.sh

Timestamp:

10/28/13 14:43:03 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16554

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/shared/Enum/Synchronize.sh (modified) (2 diffs)

issm/trunk/src/c/shared/Enum/Synchronize.sh

@@ -73 +73 @@
 #include "../Exceptions/exceptions.h"
 
-int  StringToEnumx(const char* name){
+int  StringToEnumx(const char* name,bool notfounderror){
 
    int  stage=1;
@@ -97 +97 @@
 cat <<END >> $ISSM_DIR/src/c/shared/Enum/StringToEnumx.cpp
         /*If we reach this point, the string provided has not been found*/
-        _error_("Enum " << name << " not found");
+        if(notfounderror)
+                _error_("Enum " << name << " not found");
+        else
+                return -1;
 }
 END
 #}}}
+##Build EnumToAnalysis.cpp {{{
+##Header
+#cat <<END > $ISSM_DIR/src/c/analyses/EnumToAnalysis.cpp
+#/*
+#* \file EnumToAnalysis.cpp
+#* \brief: output class depending on enum
+#*
+#*   WARNING: DO NOT MODIFY THIS FILE
+#*            this file has been automatically generated by Synchronize.sh
+#*            Please read README for more information
+#*/
+#
+##include "./analyses.h"
+##include "../shared/shared.h"
+#
+#Analysis* EnumToAnalysis(int analysis_enum){
+#
+#       switch(analysis_enum){
+#END
+##core
+#cat temp | grep [a-z]Analysis | \
+#       grep -v DefaultAnalysis | grep -v FlaimAnalysis | grep -v SurfaceSlopeAnalysis | grep -v BedSlopeAnalysis | \
+#       awk '{print "\t\t#ifdef _HAVE_"toupper(substr($1,1,length($1)-12))"_\n\t\t" "case " $1" : return new " substr($1,1,length($1)-4) "();\n\t\t#endif"}' \
+#               >> $ISSM_DIR/src/c/analyses/EnumToAnalysis.cpp
+#
+##Footer
+#cat <<END >> $ISSM_DIR/src/c/analyses/EnumToAnalysis.cpp
+#default : _error_("enum provided not supported ("<<EnumToStringx(analysis_enum)<<")");
+#       }
+#}
+#END
+##}}}
 #Build EnumDefinitions.py{{{
 cat <<END > $ISSM_DIR/src/m/enum/EnumDefinitions.py