Skip to content
Snippets Groups Projects
Commit 043566c8 authored by Arthur Coolen's avatar Arthur Coolen
Browse files

Bug756: changes for OLAP release 1.3

parent 3b0b7e46
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
MAC/Deployment/data/OTDB/CorrAppl.comp
+ 5
− 5
View file @ 043566c8
...@@ -7,20 +7,20 @@ ...@@ -7,20 +7,20 @@
# name vers qual constr. descr. # name vers qual constr. descr.
#-------------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------------
node Correlator 1.0.0 development 'node constraint' "Correlator" node Correlator 1.0.1 development 'node constraint' "Correlator"
# name dir. type unit prun. vm value constr. descr. # name dir. type unit prun. vm value constr. descr.
#-------------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------------
par _executable I text - 10 0 'CS1_BGL_Processing' - 'The name of the executable to start' par _executable I text - 10 0 'CS1_BGL_Processing' - 'The name of the executable to start'
par _hostname I text - 10 0 'bglfen0' - 'The machine on which the start- and stop-script is executed.' par _hostname I text - 10 0 'bglfen0' - 'The machine on which the start- and stop-script is executed.'
par _nodes I vtext - 10 0 '[]' - 'Nodes used by the (mpi)processes' par _nodes I vtext - 10 0 '[]' - 'Nodes used by the (mpi)processes'
par _startstopType I ptext - 10 0 "cmdline|mpirun|bgl;bgl" - 'Method of starting the proces' par _startstopType I ptext - 10 0 "cmdline|mpirun|bgl;bgl" - 'Method of starting the proces'
par partition I text - 10 0 "R000_128_0Z" - 'Blue Gene partition to use' par partition I text - 10 0 "R000_128_0T" - 'Blue Gene partition to use'
par workingdir I text - 10 0 "/cephome/lofar/bin/" - 'Directory to use.' par workingdir I text - 10 0 "/cephome/lofar-prod/bin/" - 'Directory to use.'
# name vers qual constr. descr. # name vers qual constr. descr.
#-------------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------------
node CorrAppl 1.0.0 development 'node constraint' "CorrAppl" node CorrAppl 1.0.1 development 'node constraint' "CorrAppl"
uses Correlator 1.0.0 development 'node constraint' "Correlator" uses Correlator 1.0.1 development 'node constraint' "Correlator"
# name dir. type unit prun. vm value constr. descr. # name dir. type unit prun. vm value constr. descr.
#-------------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------------
......
MAC/Deployment/data/OTDB/OLAP.comp
+ 25
− 26
View file @ 043566c8
...@@ -4,47 +4,45 @@ ...@@ -4,47 +4,45 @@
# #
# name vers qual constr. descr. # name vers qual constr. descr.
#-------------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------------
node BGLProc 1.0.2 development 'node constraint' "Blue Gene Processing" node BGLProc 1.0.3 development 'node constraint' "Blue Gene Processing"
# name dir. type unit prun. vm value constr. descr. # name dir. type unit prun. vm value constr. descr.
#-------------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------------
par integrationSteps I int - 10 0 768 - '???' par integrationSteps I int - 10 0 768 - '???'
par maxConcurrentComm I int - 10 0 1 - "max number of nodes that share the same ethernet device" par maxConcurrentComm I int - 10 0 1 - "max number of nodes that share the same ethernet device"
par nodesPerPset I pint - 10 0 "2|4|6|8|10|12|14|16;16" - "number of BGL nodes in one Pset" par nodesPerPset I pint - 10 0 "2|4|6|8|10|12|14|16;16" - "number of BGL nodes in one Pset"
par nrPPFTaps I int - 10 0 16 - "number of elements in the polyphasefilter" par nrPPFTaps I int - 10 0 16 - "number of elements in the polyphasefilter"
par psetsPerCell I pint - 10 0 "1|2;1" - "number of Pset per Cell" par psetsPerCell I pint - 10 0 "1|2;1" - "number of Pset per Cell"
par useZoid I bool - 10 0 true - 'Use new ZOID software' par useZoid I bool - 10 0 true - 'Use new ZOID software'
par coresPerPset I int - 10 0 16 - '???'
# -- OLAP_Conn-- # -- OLAP_Conn--
# name vers qual constr. descr. # name vers qual constr. descr.
#-------------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------------
node OLAP_Conn 1.0.2 development 'node constraint' "Connection specification of OLAP" node OLAP_Conn 1.0.3 development 'node constraint' "Connection specification of OLAP"
# name dir. type unit prun. vm value constr. descr. # name dir. type unit prun. vm value constr. descr.
#-------------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------------
par AMCServerPort I int - 10 0 31337 - "Port the AMCServer is listening on" par AMCServerPort I int - 10 0 31337 - "Port the AMCServer is listening on"
par AMCServerHost I text - 10 0 localhost - "Machine the AMCServer is running on" par AMCServerHost I text - 10 0 localhost - "Machine the AMCServer is running on"
par station_Input_Transport I ptext - 10 0 'File|TCP|UDP|Null;UDP' - 'Type of transport used between Station en InputSection.' par station_Input_Transport I ptext - 10 0 'File|TCP|UDP|Null;UDP' - 'Type of transport used between Station en InputSection.'
par input_DelayComp_Transport I ptext - 10 0 'TCP|Null;TCP' - 'Type of transport used between Input section and the DelayCompensation.' par input_BGLProc_Transport I ptext - 10 0 'File|TCP|UDP|Null;TCP' - 'Type of transport used between Input section and the Blue Gene.'
par input_BGLProc_Transport I ptext - 10 0 'File|TCP|UDP|Null;TCP' - 'Type of transport used between Input section and the Blue Gene.' par input_BGLProc_Ports I vtext - 10 0 '[8100..8163]' - 'Portnumbers to use in the connections.'
par input_BGLProc_Ports I vtext - 10 0 '[8100..8163]' - 'Portnumbers to use in the connections.' par input_BGLProc_BaseFileName I text - 10 0 '/data/gijs' - 'File to use when transport=File'
par input_BGLProc_BaseFileName I text - 10 0 '/data/gijs' - 'File to use when transport=File' par BGLProc_Storage_Ports I vtext - 10 0 '[8300..8363]' - 'Portnumbers to use in the connections.'
par BGLProc_Storage_Transport I ptext - 10 0 'File|TCP|UDP|Null;TCP' - 'Type of transport used between Blue Gene and StorageSection.'
par BGLProc_Storage_Ports I vtext - 10 0 '[8300..8363]' - 'Portnumbers to use in the connections.'
par BGLProc_Storage_BaseFileName I text - 10 0 'Correlations' - 'File to use when transport=File'
# -- DelayComp -- # -- DelayComp --
# name vers qual constr. descr. # name vers qual constr. descr.
#-------------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------------
node DelayComp 1.0.0 development 'node constraint' "Setting of the delaycompensation" node DelayComp 1.0.1 development 'node constraint' "Setting of the delaycompensation"
# name dir. type unit prun. vm value constr. descr. # name dir. type unit prun. vm value constr. descr.
#-------------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------------
par converterType I ptext - 10 0 'IMPL|Client;IMPL' - 'Depends on whether of not AIPS++ is installed' par converterType I ptext - 10 0 'IMPL|Client;IMPL' - 'Depends on whether of not AIPS++ is installed'
par hostname I text - 10 0 'list001' - 'Machine the Delay Compensation-program runs on' par hostname I text - 10 0 '10.181.0.1' - 'Machine the Delay Compensation-program runs on'
par ports I vint - 10 0 '[7200..7263]' - 'The ports the Delay Compansation-program listens on' par ports I vint - 10 0 '[7200..7263]' - 'The ports the Delay Compansation-program listens on'
par positionType I text - 10 0 'ITRF' - '???' par positionType I text - 10 0 'ITRF' - '???'
# -- IONProc # -- IONProc
...@@ -78,7 +76,7 @@ par subbandsPerMS I int - 10 0 1 - '???' ...@@ -78,7 +76,7 @@ par subbandsPerMS I int - 10 0 1 - '???'
# -- OLAP-- # -- OLAP--
# name vers qual constr. descr. # name vers qual constr. descr.
#-------------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------------
node OLAP 1.0.4 development 'node constraint' "OLAP" node OLAP 1.0.5 development 'node constraint' "OLAP"
# name dir. type unit prun. vm value constr. descr. # name dir. type unit prun. vm value constr. descr.
#-------------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------------
...@@ -92,11 +90,12 @@ par nrTimesInFrame I int - 10 0 16 - '???' ...@@ -92,11 +90,12 @@ par nrTimesInFrame I int - 10 0 16 - '???'
par storageStationNames I vtext - 10 0 '[CS001_dipole0,CS001_dipole4,CS001_dipole8,CS001_dipole12,CS008_dipole0,CS008_dipole4,CS008_dipole8,CS008_dipole12,CS010_dipole0,CS010_dipole4,CS010_dipole8,CS010_dipole12,CS016_dipole0,CS016_dipole4,CS016_dipole8,CS016_dipole12]' - '???' par storageStationNames I vtext - 10 0 '[CS001_dipole0,CS001_dipole4,CS001_dipole8,CS001_dipole12,CS008_dipole0,CS008_dipole4,CS008_dipole8,CS008_dipole12,CS010_dipole0,CS010_dipole4,CS010_dipole8,CS010_dipole12,CS016_dipole0,CS016_dipole4,CS016_dipole8,CS016_dipole12]' - '???'
par psetsPerStorage I int - 10 0 6 - '???' par psetsPerStorage I int - 10 0 6 - '???'
par subbandsPerPset I int - 10 0 3 - '???' par subbandsPerPset I int - 10 0 3 - '???'
par maxNetworkDelay I int - 10 0 1 - '???'
# name vers qual constr. descr. # name vers qual constr. descr.
#-------------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------------
uses BGLProc 1.0.2 development 'node constraint' "Blue Gene Processing" uses BGLProc 1.0.3 development 'node constraint' "Blue Gene Processing"
uses OLAP_Conn 1.0.2 development 'node constraint' "Connection specification of OLAP" uses OLAP_Conn 1.0.3 development 'node constraint' "Connection specification of OLAP"
uses DelayComp 1.0.0 development 'node constraint' "Setting of the delaycompensation" uses DelayComp 1.0.1 development 'node constraint' "Setting of the delaycompensation"
uses IONProc 1.0.0 development 'node constraint' "???" uses IONProc 1.0.0 development 'node constraint' "???"
uses StorageProc 1.0.1 development 'node constraint' "???" uses StorageProc 1.0.1 development 'node constraint' "???"
MAC/Deployment/data/OTDB/OnlineCtrl.comp
+ 2
− 2
View file @ 043566c8
...@@ -16,7 +16,7 @@ par applOrder I vtext - 10 0 [CorrAppl,DelayAppl,InputA ...@@ -16,7 +16,7 @@ par applOrder I vtext - 10 0 [CorrAppl,DelayAppl,InputA
uses ApplCtrl 1.0.0 development 1 "The ACC controller" uses ApplCtrl 1.0.0 development 1 "The ACC controller"
uses InputAppl 1.0.1 development 1 "InputSection Application" uses InputAppl 1.0.1 development 1 "InputSection Application"
uses DelayAppl 1.0.0 development 1 "DelayCompensation Application" uses DelayAppl 1.0.0 development 1 "DelayCompensation Application"
uses CorrAppl 1.0.0 development 1 "Blue Gene Application" uses CorrAppl 1.0.1 development 1 "Blue Gene Application"
uses StorageAppl 1.0.0 development 1 "StorageSection Application" uses StorageAppl 1.0.0 development 1 "StorageSection Application"
uses OLAP 1.0.4 development 1 "OLAP specific information" uses OLAP 1.0.5 development 1 "OLAP specific information"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment