Goal is to merge the latest "JRC" version of the PyShell code into the main development line.
A new base will be created which combines:
* latest "base/branches/var4d-mt" from the mercurial branch "sourish" ;
* latest "base/branches/var4d-jrc" from the mercurial branch "jrc".
The following subsections contain tables with differences found between the above
versions, plus a suggestion on how to treat this in the new merged version.
Not all differences might be worthwile a long discussion, but if they do, please add your ideas.
The differences are classified with the following labels:
* cosmetic : no change in results, but only fix for better error detection, version dependencies, layout changes, etc.
* extension : new feature, does not alter existing configurations
* unknown : no idea
what | sourish | jrc | clasification | proposal |
---|---|---|---|---|
gss scripts | no paths '/bin' etc | cosmetic | use jrc version, works at more machines | |
submit_tm5_setup_rcfile.py | support break per year | extension | use sourish version, extended | |
submit_tm5_step_done | Force overwrite when archiving | cosmetic | use jrc version, less runtime errors | |
submit_tm5_step_run | no check on "tm5.ok" file, current location unclear | cosmetic | use sourish version less runtime errors | |
submit_tm5_tools.py | qsub options with '#PBS' | qsub options with '#$' | unknown | use sourish version, if this is the new format required by qsub? |
what | sourish | jrc | clasification | proposal |
---|---|---|---|---|
m1qn3 | - | job scripts and optimizer | extension | add m1qn3 subdirectory, this could live next to congrad |
what | sourish | jrc | clasification | proposal |
---|---|---|---|---|
binas.py | - | constants | extension | add to source tree |
go*.py | - | helper modules | extension | add to source tree, tools once found to be needed |
grid.py | - | helper module | extension | add to source tree |
Installer.py | - | helper module | extension | add to source tree |
LogTree.py | - | helper module | extension | add to source tree, used for redirection of messages to specific log files |
NoNio.py | - | helper module | extension | add to source tree, surrogate if Nio is not installed, shouldn't Nio be avoided anyway ? |
Utilities.py | trap numpy version dependency | cosmetic | use jrc version | |
rc.py | depricated | latest version using classes | cosmetic | use jrc version |
termcolor.py | - | part of tree | extension | add to source tree |