Changeset 19804

Timestamp:

11/25/15 13:43:09 (9 years ago)

Author:

Eric.Larour

Message:

CHG: new javascript compile related enums for output memory buffers. Also, modified the Synchronize.sh
to optimize the enum file, no need to go through EnumToString!

Location:

issm/trunk-jpl/src/c/shared/Enum

Files:

• EnumDefinitions.h (modified) (1 diff)
• EnumToStringx.cpp (modified) (1 diff)
• StringToEnumx.cpp (modified) (1 diff)
• Synchronize.sh (modified) (2 diffs)

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

@@ -953 +953 @@
         NodalEnum,
         OldGradientEnum,
+        OutputBufferPointerEnum,
+        OutputBufferSizePointerEnum,
         OutputFilePointerEnum,
         ToolkitsFileNameEnum,

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

@@ -921 +921 @@
                 case NodalEnum : return "Nodal";
                 case OldGradientEnum : return "OldGradient";
+                case OutputBufferPointerEnum : return "OutputBufferPointer";
+                case OutputBufferSizePointerEnum : return "OutputBufferSizePointer";
                 case OutputFilePointerEnum : return "OutputFilePointer";
                 case ToolkitsFileNameEnum : return "ToolkitsFileName";

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

@@ -942 +942 @@
               else if (strcmp(name,"Nodal")==0) return NodalEnum;
               else if (strcmp(name,"OldGradient")==0) return OldGradientEnum;
+              else if (strcmp(name,"OutputBufferPointer")==0) return OutputBufferPointerEnum;
+              else if (strcmp(name,"OutputBufferSizePointer")==0) return OutputBufferSizePointerEnum;
               else if (strcmp(name,"OutputFilePointer")==0) return OutputFilePointerEnum;
               else if (strcmp(name,"ToolkitsFileName")==0) return ToolkitsFileNameEnum;

issm/trunk-jpl/src/c/shared/Enum/Synchronize.sh ¶

@@ -8 +8 @@
 rm $ISSM_DIR/src/m/enum/*.m
 rm $ISSM_DIR/src/m/enum/*.py
+rm $ISSM_DIR/src/m/enum/*.js
 rm $ISSM_DIR/src/c/shared/Enum/EnumToStringx.cpp
 rm $ISSM_DIR/src/c/shared/Enum/StringToEnumx.cpp
@@ -206 +207 @@
 END
 #core
-cat temp |  awk '{print "function " $1"(){ return StringToEnum(\"" substr($1,1,length($1)-4) "\");\}"}' >> $ISSM_DIR/src/m/enum/EnumDefinitions.js
+ENUM=0;
+for NAMEENUM in $(cat temp); do
+        #Get name and enum of the line i
+        NAME=$(echo $NAMEENUM | sed -e "s/Enum//g")
+        echo "function ${NAME}Enum(){ return $ENUM;}" >> $ISSM_DIR/src/m/enum/EnumDefinitions.js
+        #offset Enum by one (Enum begins with 0 and not 1!)
+        let ENUM=$ENUM+1
+done
 #}}}