Skip to content

Source tree variable fix#1069

Merged
adcroft merged 1 commit into
mom-ocean:dev/gfdlfrom
marshallward:makefile_srcfix
Mar 5, 2020
Merged

Source tree variable fix#1069
adcroft merged 1 commit into
mom-ocean:dev/gfdlfrom
marshallward:makefile_srcfix

Conversation

@marshallward
Copy link
Copy Markdown
Collaborator

This fixes a bug in the SOURCE variable which was used to track files
during development. It is generally unused for test builds.

This was reworked to include support for FMS and the target repository.
SOURCE is now a Makefile function which support MOM6 and FMS trees.
We also extended it to catch other extensions: .inc .c .h

These variables are used to link the top Makefile to the mkmf-generated
makefiles, in order to trigger a rebuild via mkmf-makefile changes.

I would not expect these SOURCE dependents to persist if we move to
the autoconf build system.


This only affects the makefile used by Travis (and possibly users at command line) so should not require Gaea regression testing.

This fixes a bug in the SOURCE variable which was used to track files
during development.  It is generally unused for test builds.

This was reworked to include support for FMS and the target repository.
`SOURCE` is now a Makefile function which support MOM6 and FMS trees.
We also extended it to catch other extensions: .inc .c .h

These variables are used to link the top Makefile to the mkmf-generated
makefiles, in order to trigger a rebuild via mkmf-makefile changes.

I would not expect these `SOURCE` dependents to persist if we move to
the autoconf build system.
@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #1069 into dev/gfdl will decrease coverage by 0.3%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           dev/gfdl    #1069      +/-   ##
============================================
- Coverage     45.52%   45.22%   -0.31%     
============================================
  Files           211      211              
  Lines         62690    62690              
============================================
- Hits          28541    28350     -191     
- Misses        34149    34340     +191
Impacted Files Coverage Δ
src/core/MOM_dynamics_unsplit_RK2.F90 0% <0%> (-92.9%) ⬇️
src/core/MOM.F90 68.71% <0%> (-0.33%) ⬇️
...c/parameterizations/vertical/MOM_set_viscosity.F90 70.04% <0%> (-0.31%) ⬇️
...c/parameterizations/vertical/MOM_vert_friction.F90 71.94% <0%> (-0.13%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d38ad16...7d219ef. Read the comment docs.

@adcroft adcroft merged commit e6a4708 into mom-ocean:dev/gfdl Mar 5, 2020
@marshallward marshallward deleted the makefile_srcfix branch September 2, 2020 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants