Merge branch 'master' into work

Update at Fri Mar 3 09:11:52 EST 2017 by tim
Corrected new JSON file output format from netgen.
2026-08-23 22:47:20 +02:00 · 2017-03-03 09:11:54 -05:00 · 2017-03-03 09:11:52 -05:00 · 2017-03-03 09:11:30 -05:00
2 changed files with 7 additions and 11 deletions
@@ -1 +1 @@
-1.5.73
+1.5.74
@@ -194,15 +194,13 @@ proc netgen::convert_to_json {filename lvs_final} {
 	                   puts $fjson "          \],"
 			}
 		     }
+	             puts $fjson "        \]"
 		     if {$gidx == $glen} {
-	                puts $fjson "        \]"
+	                puts $fjson "      \]"
 		     } else {
-	                puts $fjson "        \],"
+	                puts $fjson "      \],"
 		     }
 		  }
-		  if {$glen > 0} {
-		     puts $fjson "      \]"
-		  }
 		  if {$kidx == $nkeys} {
 		     puts $fjson "   \]"
 		  } else {
@@ -275,15 +273,13 @@ proc netgen::convert_to_json {filename lvs_final} {
 	                   puts $fjson "          \],"
 			}
 		     }
+	             puts $fjson "        \]"
 		     if {$gidx == $glen} {
-	                puts $fjson "        \]"
+	                puts $fjson "      \]"
 		     } else {
-	                puts $fjson "        \],"
+	                puts $fjson "      \],"
 		     }
 		  }
-		  if {$glen > 0} {
-		     puts $fjson "      \]"
-		  }
 		  if {$kidx == $nkeys} {
 		     puts $fjson "   \]"
 		  } else {
Author	SHA1	Message	Date
Tim Edwards	090e9e122a	Merge branch 'master' into work	2017-03-03 09:11:54 -05:00
Tim Edwards	67f1c1a2e9	Update at Fri Mar 3 09:11:52 EST 2017 by tim	2017-03-03 09:11:52 -05:00
Tim Edwards	a7dcb4ef45	Corrected new JSON file output format from netgen.	2017-03-03 09:11:30 -05:00
@@ -1 +1 @@
 .5.73
 .5.74