Issue #21 - Add support for WCOSS phase 3.5 #40
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -91,6 +91,17 @@ def edit_baseconfig(): | |
| .replace('@CASECTL@', 'C%d' % resdet) \ | ||
| .replace('@NMEM_ENKF@', '%d' % nens) \ | ||
| .replace('@HOMEgfs@', top) \ | ||
| .replace('@BASE_GIT@', base_git) \ | ||
| .replace('@BASE_SVN@', base_svn) \ | ||
| .replace('@DMPDIR@', dmpdir) \ | ||
| .replace('@NWPROD@', nwprod) \ | ||
| .replace('@HOMEDIR@', homedir) \ | ||
| .replace('@STMP@', stmp) \ | ||
| .replace('@PTMP@', ptmp) \ | ||
| .replace('@NOSCRUB@', noscrub) \ | ||
| .replace('@ACCOUNT@', account) \ | ||
| .replace('@QUEUE@', queue) \ | ||
| .replace('@QUEUE_ARCH@', queue_arch) \ | ||
| .replace('@gfs_cyc@', '%d' % gfs_cyc) | ||
| if expdir is not None: | ||
| line = line.replace('@EXPDIR@', os.path.dirname(expdir)) | ||
|
|
@@ -129,6 +140,7 @@ def edit_baseconfig(): | |
| parser.add_argument('--nens', help='number of ensemble members', type=int, required=False, default=20) | ||
| parser.add_argument('--cdump', help='CDUMP to start the experiment', type=str, required=False, default='gdas') | ||
| parser.add_argument('--gfs_cyc', help='GFS cycles to run', type=int, choices=[0, 1, 2, 4], default=1, required=False) | ||
| parser.add_argument('--partition', help='partition on machine', type=str, required=False, default=None) | ||
|
|
||
| args = parser.parse_args() | ||
|
|
||
|
|
@@ -149,6 +161,48 @@ def edit_baseconfig(): | |
| nens = args.nens | ||
| cdump = args.cdump | ||
| gfs_cyc = args.gfs_cyc | ||
| partition = args.partition | ||
|
|
||
| # Set machine defaults | ||
| if machine is 'WCOSS_DELL_P3': | ||
|
Contributor
There was a problem hiding this comment. OK, I see now you have most of the parameters defined in the setup python script. It is fine. Still, users may have to edit these settings locally in their EXPRDIR because not all are using or can use the same disk allocation.
Contributor
Author
There was a problem hiding this comment. The defaults we had in config.base.emc.dyn before were moved into the setup_expt scripts so the final config.base generated will only include the defaults for the machine the user is on. Users will then need to update their config.base before running setup_workflow script, just as they had to before.
Contributor
There was a problem hiding this comment. @KateFriedman-NOAA
Contributor
Author
There was a problem hiding this comment. Gotcha, thanks! |
||
| base_git = '/gpfs/dell2/emc/modeling/noscrub/emc.glopara/git' | ||
| base_svn = '/gpfs/dell2/emc/modeling/noscrub/emc.glopara/git' | ||
| dmpdir = '/gpfs/dell3/emc/global/dump' | ||
| nwprod = '/gpfs/dell1/nco/ops/nwprod' | ||
| homedir = '/gpfs/dell2/emc/modeling/noscrub/$USER' | ||
| stmp = '/gpfs/dell3/stmp/$USER' | ||
| ptmp = '/gpfs/dell3/ptmp/$USER' | ||
| noscrub = '/gpfs/dell2/emc/modeling/noscrub/$USER' | ||
| account = 'GFS-DEV' | ||
| queue = 'dev' | ||
| queue_arch = 'dev_transfer' | ||
| if partition is not None and partition in ['3p5']: | ||
| queue = 'dev2' | ||
| queue_arch = 'dev2_transfer' | ||
| elif machine is 'WCOSS_C': | ||
| base_git = '/gpfs/hps3/emc/global/noscrub/emc.glopara/git' | ||
| base_svn = '/gpfs/hps3/emc/global/noscrub/emc.glopara/svn' | ||
| dmpdir = '/gpfs/dell3/emc/global/dump' | ||
| nwprod = '/gpfs/hps/nco/ops/nwprod' | ||
| homedir = '/gpfs/hps3/emc/global/noscrub/$USER' | ||
| stmp = '/gpfs/hps2/stmp/$USER' | ||
| ptmp = '/gpfs/hps2/ptmp/$USER' | ||
| noscrub = '/gpfs/hps3/emc/global/noscrub/$USER' | ||
| account = 'GFS-DEV' | ||
| queue = 'dev' | ||
| queue_arch = 'dev_transfer' | ||
| elif machine is 'HERA': | ||
| base_git = '/scratch1/NCEPDEV/global/glopara/git' | ||
| base_svn = '/scratch1/NCEPDEV/global/glopara/svn' | ||
| dmpdir = '/scratch1/NCEPDEV/global/glopara/dump' | ||
| nwprod = '/scratch1/NCEPDEV/global/glopara/nwpara' | ||
| homedir = '/scratch1/NCEPDEV/global/$USER' | ||
| stmp = '/scratch1/NCEPDEV/stmp2/$USER' | ||
| ptmp = '/scratch1/NCEPDEV/stmp4/$USER' | ||
| noscrub = '$HOMEDIR' | ||
| account = 'fv3-cpu' | ||
| queue = 'batch' | ||
| queue_arch = 'service' | ||
|
|
||
| if args.icsdir is not None and not os.path.exists(icsdir): | ||
| msg = 'Initial conditions do not exist in %s' % icsdir | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Kate, removing the references to specific machines in config.base is fine, but where will these parameters be defined, including account, queue and directory settings ? Do you have a script that defines these parameters for each machine and then call the python setup scripts ? No one can remember all the parameters for different platforms. I have been using a script, for example, /gpfs/dell6/emc/modeling/noscrub/emc.glopara/para_gfs/misc/rocoto_cycled_warm.sh, to set up my runs.