Rev | Line | |
---|
[25834] | 1 | Index: ../trunk-jpl/src/m/classes/clusters/pfe.py
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/src/m/classes/clusters/pfe.py (revision 25452)
|
---|
| 4 | +++ ../trunk-jpl/src/m/classes/clusters/pfe.py (revision 25453)
|
---|
| 5 | @@ -30,7 +30,7 @@
|
---|
| 6 | self.port = 1025
|
---|
| 7 | self.queue = 'long'
|
---|
| 8 | self.time = 12 * 60
|
---|
| 9 | - self.processor = 'wes'
|
---|
| 10 | + self.processor = 'bro'
|
---|
| 11 | self.srcpath = ''
|
---|
| 12 | self.codepath = ''
|
---|
| 13 | self.executionpath = ''
|
---|
| 14 | @@ -95,13 +95,13 @@
|
---|
| 15 | if not 0 < self.cpuspernode < 9:
|
---|
| 16 | md = md.checkmessage('cpuspernode should be between 1 and 8 for ''neh'' and ''har'' processors')
|
---|
| 17 |
|
---|
| 18 | - elif self.processor == 'wes':
|
---|
| 19 | + elif self.processor == 'bro':
|
---|
| 20 | if self.hyperthreading:
|
---|
| 21 | - if not 0 < self.cpuspernode < 25:
|
---|
| 22 | - md = md.checkmessage('cpuspernode should be between 1 and 24 for ''wes'' processors in hyperthreading mode')
|
---|
| 23 | + if not 0 < self.cpuspernode < 57:
|
---|
| 24 | + md = md.checkmessage('cpuspernode should be between 1 and 56 for ''bro'' processors in hyperthreading mode')
|
---|
| 25 | else:
|
---|
| 26 | - if not 0 < self.cpuspernode < 13:
|
---|
| 27 | - md = md.checkmessage('cpuspernode should be between 1 and 12 for ''wes'' processors')
|
---|
| 28 | + if not 0 < self.cpuspernode < 29:
|
---|
| 29 | + md = md.checkmessage('cpuspernode should be between 1 and 28 for ''bro'' processors')
|
---|
| 30 |
|
---|
| 31 | elif self.processor == 'ivy':
|
---|
| 32 | if self.hyperthreading:
|
---|
| 33 | @@ -111,7 +111,7 @@
|
---|
| 34 | if not 0 < self.cpuspernode < 21:
|
---|
| 35 | md = md.checkmessage('cpuspernode should be between 1 and 20 for ''ivy'' processors')
|
---|
| 36 | else:
|
---|
| 37 | - md = md.checkmessage('unknown processor type, should be ''neh'', ''wes'' or ''har'' or ''ivy''')
|
---|
| 38 | + md = md.checkmessage('unknown processor type, should be ''neh'', ''bro'' or ''har'' or ''ivy''')
|
---|
| 39 |
|
---|
| 40 | #Miscellaneous
|
---|
| 41 | if not self.login:
|
---|
Note:
See
TracBrowser
for help on using the repository browser.