Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Externals_CAM.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ required = True

[carma]
local_path = src/physics/carma/base
protocol = svn
repo_url = https://svn-ccsm-models.cgd.ucar.edu/carma/release_tags
tag = carma3_49_rel
protocol = git
repo_url = https://github.com/ESCOMP/CARMA_base.git
tag = carma3_49
required = True

[cosp2]
Expand Down
51 changes: 51 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,55 @@
===============================================================

Tag name:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will be filled in after the tag number is given to you

Originator(s):mlander
Date: Aug 2021
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The date will need to be changed to the date you actually do the merge

One-line Summary: Replace svn with git in carma section of Externals_CAM.cfg
Github PR URL:
https://github.com/ESCOMP/CAM/pull/415

Purpose of changes (include the issue number and title text for each relevant GitHub issue):
Point CAM to the CARMA_base github repository instead of the SVN repository (#414)

Describe any changes made to build system:

Describe any changes made to the namelist:

List any changes to the defaults for the boundary datasets:

Describe any substantial timing or memory changes:

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will need to be filled in after the reviews are complete with the people who did the review

Code reviewed by:

List all files eliminated:

List all files added and what they do:

List all existing files that have been modified, and describe the changes:
M Externals_CAM.cfg
- replaced the following lines (lines 10 & 11)
protocol = svn
repo_url = https://svn-ccsm-models.cgd.ucar.edu/carma/release_tags
with
protocol = git
repo_url = https://github.com/ESCOMP/CARMA_base.git
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@manderberg - This is fine, but probably more detail than we usually put in the ChangeLog. If you were making a change with dozens of changed lines, you will just summarize why the changes were made. A one line "Change external for CARMA to git from svn" would be sufficient. You don't need to change this. One way to look at the ChangeLog as being an index to the changes. Someone can browse through the file it to find when a change may have been made and then they can use a tool to actually investigate the actual differences.


If there were any failures reported from running test_driver.sh on any test
platform, and checkin with these failures has been OK'd by the gatekeeper,
then copy the lines from the td.*.status files for the failed tests to the
appropriate machine below. All failed tests must be justified.

cheyenne/intel/aux_cam:

izumi/nag/aux_cam:
DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae (Overall: FAIL) details:
FAIL DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae COMPARE_base_da
- pre-existing failure

izumi/pgi/aux_cam:


===============================================================
===============================================================
Tag name: cam6_3_027
Originator(s): fvitt
Date: 20 Jul 2021
Expand Down