diff --git a/MAC/Deployment/data/OTDB/OLAP.comp b/MAC/Deployment/data/OTDB/OLAP.comp index 59af3b3a77a67120c6433d13e2d6ecb449b071df..509bb30aa42808d0d1ab51fa03f4a1db82a25473 100644 --- a/MAC/Deployment/data/OTDB/OLAP.comp +++ b/MAC/Deployment/data/OTDB/OLAP.comp @@ -1,74 +1,60 @@ -# -- OLAP_HW-- +# -- BGLProc -- # # $Id$ # # name vers qual constr. descr. #-------------------------------------------------------------------------------------------------------- -node OLAP_HW 1.0.0 development 'node constraint' "OLAP Hardware" +node BGLProc 1.0.0 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 _hostname I text - 10 0 'lii002' - 'host on which OLAP will be started, value is determined by the scheduler' -par AMCServerHost I text - 10 0 '192.168.100.254' - 'ip-address of AMC server' -par AMCServerPort I int - 10 0 '8400' - 'port on which the AMC server is listening' -par DelayCompensationHost I text - 10 0 '192.168.100.254' - 'ip-address of AMC server' -par DelayCompensationPorts I text - 10 0 '[8300, 8301, 8302, 8303, 8304, 8305, 8306, 8307, 8308, 8309, 8310, 8311]' - 'ports on which DelayCompensation is listening' -par InputClusterFEN I text - 10 0 '129.125.99.51' - 'ip-address of input cluster front end' -par InputBGLHosts I text - 10 0 '[10.20.98.08, 10.20.98.09, 10.20.98.10, 10.20.98.11, 10.20.98.12, 10.20.98.13, 10.20.98.14, 10.20.98.15, 10.20.98.16, 10.20.98.17, 10.20.98.18, 10.20.98.19]' - 'hosts on which InputSection is listening' -par InputBGLPorts I text - 10 0 '[8000, 8001, 8002, 8003, 8004, 8005, 8006, 8007, 8008, 8009, 8010, 8011]' - 'ports on which InputSection is listening' -par StellaFEN I text - 10 0 'bglfen1.service.rug.nl' - 'ip-address of Stella front end' -par BGLStorageHosts I text - 10 0 '[192.168.100.01, 192.168.100.02, 192.168.100.03, 192.168.100.04, 192.168.100.05, 192.168.100.06, 192.168.100.07, 192.168.100.08, 192.168.100.09, 192.168.100.10, 192.168.100.11, 192.168.100.12]' - 'Hosts on which Storage is listening' -par BGLStoragePorts I text - 10 0 '[8100, 8101, 8102, 8103, 8104, 8105, 8106, 8107, 8108, 8109, 8110, 8111]' - 'ports on which Storage is listening' -par StorageClusterFEN I text - 10 0 'hpclf1.service.rug.nl' - 'ip-address of storage cluster front end' -par partition I text - 10 0 'R000_64' - 'partition to use on Stella' +par maxConcurrentComm I int - 10 0 2 - "max number of nodes that share the same ethernet device" +par nodesPerPset I pint - 10 0 "8|16;8" - "number of BGL nodes in one Pset" +par nrPFFTaps 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" - -# -- OLAP-- +# -- OLAP_Conn-- # name vers qual constr. descr. #-------------------------------------------------------------------------------------------------------- -node OLAP 1.0.0 development 'node constraint' "OLAP" +node OLAP_Conn 1.0.0 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 samplesToIntegrate I int - 10 0 196608 - 'number of samples to integrate, is almost equal to sample frequency' -par secondsToBuffer I flt - 10 0 30 - 'number of seconds that should be buffered in the input cluster' -par useAMCServer I bool - 10 0 f - 'use an AMC server or the AMC implementation that is linked to the executable' -par nodesPerCell I int - 10 0 16 - 'number of BG/L compute cores per compute cell (or pset)' -par subbandsPerCell I int - 10 0 4 - 'number of subbands that is processed per compute cell (or pset)' -par ppfTaps I int - 10 0 16 - 'number of taps for the digital filter in the PPF' +par AMCServerPort I node - 10 0 7000 - "Port the AMCServer is listening on" +par AMCServerHost I text - 10 0 lii001 - "Machine the AMCServer is running on" +par Station_Input_Transport I ptext - 10 0 'File|Socket|Ethernet|Null;Socket' - 'Type of transport used between Station en InputSection.' +par BGLProc_Storage_Transport I ptext - 10 0 'File|Socket|Ethernet|Null;Socket' - 'Type of transport used between Blue Gene and StorageSection.' +par Input_BGLProc_Transport I ptext - 10 0 'File|Socket|Ethernet|Null;Socket' - 'Type of transport used between Input section and the Blue Gene.' -# -#generic parameters needed by OLAP -# -par nrSubbands I int - 10 0 >>Observation.subbandList[] - 'number of subbands in this observation' -par nrChannelsPerSubband I int - 10 0 >>Observation.channelsPerSubband - 'number of channels per subband' -par nrStations I int - 10 0 >>VirtualInstrument.stationList[] - 'number of stations in this observation' -par nrInputNodes I int - 10 0 >>VirtualInstrument.inputNodeList[] - 'number of input nodes in this observation' -par nrRSPBoards I int - 10 0 8 - 'Total Nr of RSPboards' -par nrSamplesPerSecond I int - 10 0 >>Observation.clockMode.samplesPerSecond - 'Samples per second' -par MSName I text - 10 0 >>Observation.MSNameMask - 'Name for the Measurement set for this Observation' -par nrSamplesPerEthFrame I int - 10 0 125 - 'number of samples the RSP board will put in one ethernet frame' -par nyquistZone I int - 10 0 >>Observation.nyquistZone - 'number of the nyquist zone' -par startTime I dbl - 10 0 >>Observation.startTime - 'start time of the observation in GMT' -par stopTime I dbl - 10 0 >>Observation.stopTime - 'stop time of the observation in GMT' -par stationList I text - 10 0 >>VirtualInstrument.stationList - 'Stations taking part in this observation' -par stsPosition I text - 10 0 >>VirtualInstrument.stationList[].stsPosition - 'Station position in longitude, latitude and heigth' -par RSPMACAddresses I text - 10 0 >>VirtualInstrument.stationList[].RSPMacAddresses - 'MAC addresses of the RSPBoards' -par InputNodeMACAddresses I text - 10 0 >>VirtualInstrument.inputNodeList[].MACAddress - 'List of all MACaddresses from inputNodes' +# -- DelayComp -- +# name vers qual constr. descr. +#-------------------------------------------------------------------------------------------------------- +node DelayComp 1.0.0 development 'node constraint' "Setting of the delaycompensation" -# -#generic parameters needed by ACC to start OLAP -# -par _nodes I text - 10 0 '[]' - 'Nodes used by the BBS process' -par _startstopType I text - 10 0 cmdline,mpirun,bgl - 'Method of starting the proces' -par _executable I text - 10 0 - - 'The name of the executable to start' -par _hostname I text - 10 0 - - 'The hostname of the machine to start the proces on' -par _depends I text - 10 0 '[]' - 'The processes that must be finished before this process can start' +# 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' +# -- OLAP-- # name vers qual constr. descr. #-------------------------------------------------------------------------------------------------------- -uses OLAP_HW 1.0.0 development 1 "Partitions and IP stuff" +node OLAP 1.0.0 development 'node constraint' "OLAP" + +# name dir. type unit prun. vm value constr. descr. +#-------------------------------------------------------------------------------------------------------- +par nrBitsPerSample I int - 10 0 16 - '???' +par IPHeaderSize I int - 10 0 32 - '???' +par nrTimesInFrame I int - 10 0 16 - '???' +par EPAHeaderSize I int - 10 0 16 - '???' +par minorIntegrationSteps I int - 10 0 1000 - '???' +par majorIntegrationSteps I int - 10 0 1000 - '???' +par positionType I text - 10 0 'ITRF' - '???' +# name vers qual constr. descr. +#-------------------------------------------------------------------------------------------------------- +uses BGLProc 1.0.0 development 'node constraint' "Blue Gene Processing" +uses OLAP_Conn 1.0.0 development 'node constraint' "Connection specification of OLAP" +uses DelayComp 1.0.0 development 'node constraint' "Setting of the delaycompensation" diff --git a/MAC/Deployment/data/OTDB/logger.log_prop b/MAC/Deployment/data/OTDB/logger.log_prop index 3f6b646c4b1f0a9df193a16735de234c80d2338f..2cf33a465226a26cc1fbda5200647b4d095a384e 100644 --- a/MAC/Deployment/data/OTDB/logger.log_prop +++ b/MAC/Deployment/data/OTDB/logger.log_prop @@ -11,6 +11,3 @@ log4cplus.appender.STDOUT.ImmediateFlush=true # Define TRC at level INFO log4cplus.logger.TRC=INFO - - -