Fix issue with CYME converter for CYME 9 Rev 6 MDB files

converters/autotest/test_mdbtable2glm.glm

@@ -0,0 +1,17 @@
+#ifmissing /usr/local/bin/mdb-schema
+
+#warning mdbtools is not available
+
+#else // found /usr/local/bin/mdb-schema
+
+#ifexist ../IEEE-13-cyme.mdb
+#define DIR=..
+#endif // exist ../IEEE-13-cyme.mdb
+
+#input "${DIR:-.}/IEEE-13-cyme.mdb" -o IEEE-13-cyme-network.glm -t cyme
+
+#ifexist ../IEEE-13-cyme-network.glm
+#on_exit 0 diff -I '^[#/]' ../IEEE-13-cyme-network.glm IEEE-13-cyme-network.glm > gridlabd.diff
+#endif // exist ../IEEE-13-cyme-network.glm
+
+#endif // missing /usr/local/bin/mdb-schema

converters/autotest/test_mdbtable2glmobject.glm

@@ -8,10 +8,10 @@
 #define DIR=..
 #endif // exist ../IEEE-13-cyme.mdb
 
-#input "${DIR:-.}/IEEE-13-cyme.mdb" -o IEEE-13-cyme.glm -t table -f object -p table=CYMLOAD -p class=test -p modules=powerflow,residential -p columns=DeviceNumber:name -p dtypes=NetworkId:int32
+#input "${DIR:-.}/IEEE-13-cyme.mdb" -o IEEE-13-cyme-object.glm -t table -f object -p table=CYMLOAD -p class=test -p modules=powerflow,residential -p columns=DeviceNumber:name -p dtypes=NetworkId:int32
 
-#ifexist ../IEEE-13-cyme.glm
-#on_exit 0 diff -I '^[#/]' ../IEEE-13-cyme.glm IEEE-13-cyme.glm > gridlabd.diff
-#endif // exist ../IEEE-13-cyme.glm
+#ifexist ../IEEE-13-cyme-object.glm
+#on_exit 0 diff -I '^[#/]' ../IEEE-13-cyme-object.glm IEEE-13-cyme-object.glm > gridlabd.diff
+#endif // exist ../IEEE-13-cyme-object.glm
 
 #endif // missing ${GLD_BIN}/mdb-schema

converters/json2png.py

@@ -27,9 +27,10 @@ def help():
 resolution = "300"
 size = "300x200"
 limit = None
+xlim = None
 
 try : 
-	opts, args = getopt.getopt(sys.argv[1:],"hi:o:t:d:l:s:",["help","ifile=","ofile=","type=","with-nodes","dpi=","limit=","size="])
+	opts, args = getopt.getopt(sys.argv[1:],"hi:o:t:d:l:s:x:",["help","ifile=","ofile=","type=","with-nodes","dpi=","limit=","size=","xlim"])
 except getopt.GetoptError:
 	sys.exit(2)
 if not opts : 
@@ -59,6 +60,8 @@ def help():
 		size = arg
 	elif opt in ("-l","--limit"):
 		limit = int(arg)/100
+	elif opt in ("-x","--xlim"):
+		xlim = arg.split(',')
 	else:
 		raise Exception("'%s' is an invalid command line option" % opt)
 
@@ -189,10 +192,12 @@ def profile(objects,root,pos=0):
 	plt.ylabel('Voltage (pu)')
 	plt.title(data["globals"]["modelname"]["value"])
 	plt.grid()
-	#plt.legend(["A","B","C"])
-	#plt.tight_layout()
+	plt.legend(["A","B","C"])
+	plt.tight_layout()
 	if limit:
 		plt.ylim([1-limit,1+limit])
+	if xlim:
+		plt.xlim([float(xlim[0]),float(xlim[1])])
 	plt.savefig(filename_png, dpi=int(resolution))
 
 else: