Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: change "clone of" to "forked to".

Some of the subdirectories in the ACME code contain code that was brought in from another repository.  List them all.

...

  • external any subdirectory in ACME whose entire content is from another repository
  • upstream master  the repository everyone is sending their changes to.  Only one so that everyone pulling from the same source is working with all the same changes.   The source of an external.

Methods for including externals

  • submodule  a link that points to another git repository.  See Sharing External Code using Git Submodules . Submodules require an extra step after cloning to get the code.
  • subtree a set of files and commits from another git repo, brought in to your repo.  See Sharing External Code using Git Subtree.  Subtrees are included in ACME when you "git clone".
  • monorepo adding multiple projects, related or not, in the same repo.  Code is included when you clone ACME.
  • buildtime  the repo is checked out to the $CIME_OUTPUT_ROOT/$CASE/bld when compiling a case for the first time.  Code does not exist in ACME repo.

Rules for adding externals

  1. Group leads must approve adding a new external.  The group needing the external can decide on the method of inclusion.  A POC for the upstream master must be identified and the SE group leads notified.
  2. The upstream master for the external must be build-able and testable on its own.
  3. For submodules, the linked repo must be readable by all ACME developers.  If the upstream master can not be made readable, a clone fork must be maintained in ACME-Climate github and ACME then links to that clonefork.

Development in externals

In general, there are several ways to develop with external code in ACME

...

Subdirectory in ACMEexternal methodupstream masterdevelopment methodPOCNotes
cimesubtreehttps://github.com/ESMCI/cime

2-way


cime/externals/MCTsubtreehttps://github.com/MCSclimate/MCT

mostly 1-way

usually brought in with CIME
cime/externals/pio*subtreehttps://github.com/NCAR/ParallelIO

mostly 1-way

usually brought in with CIME

components/mpas-o/model

submodule

https://github.com/ACMEMPAS-ClimateDev/MPAS clone of forked to https://github.com/MPASACME-DevClimate/MPAS

strict 1-way

components/mpasli/model

submodulehttps://github.com/ACMEMPAS-ClimateDev/MPAS clone of forked tohttps://github.com/MPASACME-DevClimate/MPASstrict 1-wayMatt Hoffman

components/mpas-cice/model

submodulehttps://github.com/ACMEMPAS-ClimateDev/MPAS clone of forked tohttps://github.com/MPASACME-DevClimate/MPAS: branch cice/developstrict 1-way

components/clm/src/external_models/fates

submodule

https://github.com/ACME-ClimateNGEET/fates clone of forked to https://github.com/NGEETACME-Climate/fates

strict 1-way

components/clm/src/external_models/mpp

submodulehttps://github.com/ACME-Climate/mpp branch alm/developstrict 1-wayGautam Bisht
components/hommemonorepoNANAMark TaylorACME CAM uses

homme/src/share and homme/src/preqx

CVMixbuildtimehttps://github.com/CVMix/CVMix-srcstrict 1-way?After case.build, can be found in

$EXEROOT/ocn/source/core_ocean/.cvmix_all

ocean BGCbuildtimehttps://github.com/ACME-Climate/Ocean-BGCstrict 1-way?After case.build, can be found in

$EXEROOT/ocn/source/core_ocean/.BGC_all

...