Skip to content

Commit 9a5f000

Browse files
authored
Merge pull request #269 from pathsim/fix/toolbox-import-paths
Fix streaming simulation imports for toolbox blocks
2 parents dca9d1b + 79bc5a8 commit 9a5f000

3 files changed

Lines changed: 379 additions & 24 deletions

File tree

pathview/data/registry.json

Lines changed: 186 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@
138138
"blockClass": "Delay",
139139
"importPath": "pathsim.blocks",
140140
"params": [
141-
"tau"
141+
"tau",
142+
"sampling_period"
142143
]
143144
},
144145
"ODE": {
@@ -304,6 +305,14 @@
304305
"importPath": "pathsim.blocks",
305306
"params": []
306307
},
308+
"Divider": {
309+
"blockClass": "Divider",
310+
"importPath": "pathsim.blocks",
311+
"params": [
312+
"operations",
313+
"zero_div"
314+
]
315+
},
307316
"Amplifier": {
308317
"blockClass": "Amplifier",
309318
"importPath": "pathsim.blocks",
@@ -385,11 +394,32 @@
385394
"exponent"
386395
]
387396
},
397+
"Atan2": {
398+
"blockClass": "Atan2",
399+
"importPath": "pathsim.blocks",
400+
"params": []
401+
},
402+
"Rescale": {
403+
"blockClass": "Rescale",
404+
"importPath": "pathsim.blocks",
405+
"params": [
406+
"i0",
407+
"i1",
408+
"o0",
409+
"o1",
410+
"saturate"
411+
]
412+
},
413+
"Alias": {
414+
"blockClass": "Alias",
415+
"importPath": "pathsim.blocks",
416+
"params": []
417+
},
388418
"Switch": {
389419
"blockClass": "Switch",
390420
"importPath": "pathsim.blocks",
391421
"params": [
392-
"state"
422+
"switch_state"
393423
]
394424
},
395425
"LUT": {
@@ -409,6 +439,38 @@
409439
"fill_value"
410440
]
411441
},
442+
"GreaterThan": {
443+
"blockClass": "GreaterThan",
444+
"importPath": "pathsim.blocks",
445+
"params": []
446+
},
447+
"LessThan": {
448+
"blockClass": "LessThan",
449+
"importPath": "pathsim.blocks",
450+
"params": []
451+
},
452+
"Equal": {
453+
"blockClass": "Equal",
454+
"importPath": "pathsim.blocks",
455+
"params": [
456+
"tolerance"
457+
]
458+
},
459+
"LogicAnd": {
460+
"blockClass": "LogicAnd",
461+
"importPath": "pathsim.blocks",
462+
"params": []
463+
},
464+
"LogicOr": {
465+
"blockClass": "LogicOr",
466+
"importPath": "pathsim.blocks",
467+
"params": []
468+
},
469+
"LogicNot": {
470+
"blockClass": "LogicNot",
471+
"importPath": "pathsim.blocks",
472+
"params": []
473+
},
412474
"SampleHold": {
413475
"blockClass": "SampleHold",
414476
"importPath": "pathsim.blocks",
@@ -480,6 +542,15 @@
480542
"value_down"
481543
]
482544
},
545+
"Wrapper": {
546+
"blockClass": "Wrapper",
547+
"importPath": "pathsim.blocks",
548+
"params": [
549+
"func",
550+
"T",
551+
"tau"
552+
]
553+
},
483554
"Scope": {
484555
"blockClass": "Scope",
485556
"importPath": "pathsim.blocks",
@@ -511,32 +582,43 @@
511582
},
512583
"Process": {
513584
"blockClass": "Process",
514-
"importPath": "pathsim_chem.tritium",
585+
"importPath": "pathsim_chem",
515586
"params": [
516587
"tau",
517588
"initial_value",
518589
"source_term"
519590
]
520591
},
521-
"Bubbler4": {
522-
"blockClass": "Bubbler4",
523-
"importPath": "pathsim_chem.tritium",
592+
"ResidenceTime": {
593+
"blockClass": "ResidenceTime",
594+
"importPath": "pathsim_chem",
524595
"params": [
525-
"conversion_efficiency",
526-
"vial_efficiency",
527-
"replacement_times"
596+
"tau",
597+
"betas",
598+
"gammas",
599+
"initial_value",
600+
"source_term"
528601
]
529602
},
530603
"Splitter": {
531604
"blockClass": "Splitter",
532-
"importPath": "pathsim_chem.tritium",
605+
"importPath": "pathsim_chem",
533606
"params": [
534607
"fractions"
535608
]
536609
},
610+
"Bubbler4": {
611+
"blockClass": "Bubbler4",
612+
"importPath": "pathsim_chem",
613+
"params": [
614+
"conversion_efficiency",
615+
"vial_efficiency",
616+
"replacement_times"
617+
]
618+
},
537619
"GLC": {
538620
"blockClass": "GLC",
539-
"importPath": "pathsim_chem.tritium",
621+
"importPath": "pathsim_chem",
540622
"params": [
541623
"P_in",
542624
"L",
@@ -546,6 +628,99 @@
546628
"g",
547629
"initial_nb_of_elements"
548630
]
631+
},
632+
"CSTR": {
633+
"blockClass": "CSTR",
634+
"importPath": "pathsim_chem",
635+
"params": [
636+
"V",
637+
"F",
638+
"k0",
639+
"Ea",
640+
"n",
641+
"dH_rxn",
642+
"rho",
643+
"Cp",
644+
"UA",
645+
"C_A0",
646+
"T0"
647+
]
648+
},
649+
"PFR": {
650+
"blockClass": "PFR",
651+
"importPath": "pathsim_chem",
652+
"params": [
653+
"N_cells",
654+
"V",
655+
"F",
656+
"k0",
657+
"Ea",
658+
"n",
659+
"dH_rxn",
660+
"rho",
661+
"Cp",
662+
"C0",
663+
"T0"
664+
]
665+
},
666+
"HeatExchanger": {
667+
"blockClass": "HeatExchanger",
668+
"importPath": "pathsim_chem",
669+
"params": [
670+
"N_cells",
671+
"F_h",
672+
"F_c",
673+
"V_h",
674+
"V_c",
675+
"UA",
676+
"rho_h",
677+
"Cp_h",
678+
"rho_c",
679+
"Cp_c",
680+
"T_h0",
681+
"T_c0"
682+
]
683+
},
684+
"FlashDrum": {
685+
"blockClass": "FlashDrum",
686+
"importPath": "pathsim_chem",
687+
"params": [
688+
"holdup",
689+
"antoine_A",
690+
"antoine_B",
691+
"antoine_C",
692+
"N0"
693+
]
694+
},
695+
"Mixer": {
696+
"blockClass": "Mixer",
697+
"importPath": "pathsim_chem",
698+
"params": []
699+
},
700+
"Valve": {
701+
"blockClass": "Valve",
702+
"importPath": "pathsim_chem",
703+
"params": [
704+
"Cv"
705+
]
706+
},
707+
"Heater": {
708+
"blockClass": "Heater",
709+
"importPath": "pathsim_chem",
710+
"params": [
711+
"rho",
712+
"Cp"
713+
]
714+
},
715+
"PointKinetics": {
716+
"blockClass": "PointKinetics",
717+
"importPath": "pathsim_chem",
718+
"params": [
719+
"n0",
720+
"Lambda",
721+
"beta",
722+
"lam"
723+
]
549724
}
550725
},
551726
"events": {

0 commit comments

Comments
 (0)