Update simulator2d.js

simulator2d.js

@@ -46,7 +46,8 @@
 			if (b!='sr') continue;
 			console.log('simulatorMenu() - ', b, lattice[b], conf.simulatorSrcUrl);
 			compData[b].map = [];
-			fetch(conf.simulatorSrcUrl) 
+			console.log((conf.simulatorSrcUrl+'&machine='+machine).replace('?&','?'));
+			fetch((conf.simulatorSrcUrl+'&machine='+machine).replace('?&','?'), {cache: "no-store"})
 			.then((response) => {return response.json();})
 			.then((simulatorNaming) => {
 				console.log('simulatorNaming', simulatorNaming);
@@ -54,7 +55,7 @@
 					const name = simulatorNaming[i];
 					if (name=='SCRPH_S11' || name=='SCRPV_S11') continue;
 					for (let bl in compData[b].obj) {
-						if (name==compData[b].obj[bl].replace('CHV', 'CH')) {compData[b].map[i] = bl;}
+						if (name==compData[b].obj[bl].replace('CHV', 'CH') || name==compData[b].obj[bl].replace('CHV', 'CH').replace('.','_')) {compData[b].map[i] = bl;}
 					}
 				}
 				console.log('simulatorMenu(), name', b, compData[b], lattice[b]);
@@ -92,7 +93,7 @@
 	// const threshold = document.location.search.indexOf('threshold=')>-1? document.location.search.split('threshold=')[1].split('&')[0]: 1000;
 	// const f = document.location.search.indexOf('factor=')>-1? document.location.search.split('factor=')[1].split('&')[0]: 3000;
 	function simulator2d(lattice, params) {
-		console.log('simulator2d');
+		console.log('simulator2d',lattice, params);
 		const facilities = [];
 		for (let i in lattice) {if (i!='conf') facilities.push(i);}
 		simulatorMenu(lattice, facilities, params);
@@ -126,7 +127,7 @@
 				simulatorRead(simulatorData, params);
 			}
 			displayer = setInterval(simulatorDisplay, 200, params);
-			simulatorData.reader = setInterval(simulatorRead, 1000, simulatorData, params);
+			simulatorData.reader = setInterval(simulatorRead, 500, simulatorData, params);
 			$('#application').show();	
 			$('.simulatorhor').css('display', 'block');
 			$('.simulatorver').css('display', 'block');
@@ -143,7 +144,6 @@
 			// $("#applicationFrame").height(window.innerHeight); 
 		}		
 	}
-	const logConst = ln(10)
 	function simulatorRender(facility, val, simulator) {
 		// console.log('simulatorRender(), val', val, simulatorFactorHor);
 		const dhor = [];
@@ -180,7 +180,7 @@
 	}
 	function simulatorRead(simulatorData, params) {
 		// console.log('fetch()',conf.simulatorUrl+'&param='+params.simulator);
-		fetch(conf.simulatorUrl+'&param='+params.simulator, {cache: "no-store"})
+		fetch((conf.simulatorUrl+'&machine='+machine+'&param='+params.simulator).replace('?&','?'), {cache: "no-store"})
 		.then((response) => {return response.json();})
 		.then((eventData) => {
 			simulatorBuffer = eventData.sr;