E3SM icon indicating copy to clipboard operation
E3SM copied to clipboard

Add 'lobata' workstation to cime configuration

Open glemieux opened this issue 2 years ago • 6 comments

Add and update the necessary configuration files to include the FATES development workstation named 'lobata'.

[B4B]

glemieux avatar Jul 25 '22 18:07 glemieux

Land developer tests are b4b: /global/homes/g/glemieux/scratch/e3sm-tests/pr5094-eld3.fates.cori-haswell.intel.C3bfc481e57-Fc11c448b

glemieux avatar Aug 02 '22 15:08 glemieux

The workstation results are bfb with cori-haswell?

rljacob avatar Aug 02 '22 16:08 rljacob

The workstation results are bfb with cori-haswell?

Sorry, no, I only meant to note that this configuration update doesn't change results on cori-haswell (which is unlikely, but I assumed testing would be necessary). In adding a new machine, should I compare results to a known machine? This update is meant purely to support lobata users who develop elm-fates code, but lobata is not intended for running land developer or other tests.

glemieux avatar Aug 11 '22 16:08 glemieux

I'm also unable to access this machine. @rljacob do you just want me to integrate this?

ndkeen avatar Aug 11 '22 22:08 ndkeen

Yes just merge it.

rljacob avatar Aug 12 '22 00:08 rljacob

@glemieux no you don't have to compare to a known machine.

rljacob avatar Aug 12 '22 00:08 rljacob

How can I check out this branch?

cori% git branch
* master
* 
cori% git checkout glemieux:glemieux/lobata_configuration
error: pathspec 'glemieux:glemieux/lobata_configuration' did not match any file(s) known to git
cori% git checkout glemieux/lobata_configuration
error: pathspec 'glemieux/lobata_configuration' did not match any file(s) known to git


cori% git fetch glemiex
fatal: 'glemiex' does not appear to be a git repository
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

ndkeen avatar Aug 25 '22 17:08 ndkeen

@ndkeen I believe you need to replace the colon with a slash: git checkout glemieux/glemieux/lobata_configuration

glemieux avatar Aug 25 '22 20:08 glemieux

First you have to add his fork as a remote in your clone. That's covered in the Integrators guide under "Integrating from a fork" https://acme-climate.atlassian.net/wiki/spaces/DOC/pages/1708589129/Integrator+Guide#IntegratorGuide-Integratingfromafork

rljacob avatar Aug 25 '22 20:08 rljacob

ok. this would be the first time I've needed to deal with a fork going to e3sm. Is it really necessary?

git remote add glemieux/E3SM [email protected]:glemieux/E3SM.git
git fetch glemieux/E3SM -p
git checkout glemieux/lobata_configuration

cori% git branch
* glemieux/lobata_configuration
  master

git submodule -q update --recursive --init

cori% git checkout next
hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
hint: you can do so by fully qualifying the name with the --track option:
hint: 
hint:     git checkout --track origin/<name>
hint: 
hint: If you'd like to always have checkouts of an ambiguous <name> prefer
hint: one remote, e.g. the 'origin' remote, consider setting
hint: checkout.defaultRemote=origin in your config.
fatal: 'next' matched multiple (2) remote tracking branches


ndkeen avatar Aug 25 '22 20:08 ndkeen

Yes since you now have 2 remotes in your clone.

rljacob avatar Aug 25 '22 21:08 rljacob

Hmm, are you saying nothing is wrong?

ndkeen avatar Aug 25 '22 21:08 ndkeen

Nothing is wrong. Do what it said to get "next".

rljacob avatar Aug 25 '22 21:08 rljacob

git checkout --track origin/next

cori% git branch
  glemieux/lobata_configuration
  master
* next

cori% git submodule -q update --recursive --init
cori% git reset --hard origin/next
HEAD is now at 15b6c6daff Merge branch 'xylar/mpas-framework/add-name-in-output-attribute' into next (PR #5120)

cori% git merge --no-ff glemieux/lobata_configuration
Already up to date.

But with the merge, was expecting the editor window.

ndkeen avatar Aug 25 '22 21:08 ndkeen

I cloned a fresh e3sm, did the same steps again -- and this time it seems to have worked.

merged to next.

ndkeen avatar Aug 25 '22 21:08 ndkeen

As expected, don't see any issues on other machines.

ndkeen avatar Aug 29 '22 17:08 ndkeen