Skip to content

Commit 52ae7f1

Browse files
committed
Fix F77→F90 conversion defects in base CONTRL.f90 and errgro.f90
CONTRL.f90 retained CRLF line terminators and fixed-form continuation (column 6 '&' markers) from the upstream F77 source. Because the file is pulled in by 40+ base modules via INCLUDE, the defect cascaded to volkey.f90 and evldx.f90 under the -ffree-form syntax-check in CI. errgro.f90 still referenced legacy 'PRGPRM.F77', 'CONTRL.F77', and 'PLOT.F77' include targets that do not exist in the tree, and carried the same column-6 continuation markers. Fixes: - Strip CRLF, convert column-6 '&' continuation to trailing '&' free-form continuation in CONTRL.f90 and errgro.f90. - Rewrite errgro.f90 INCLUDE statements to target the .f90 files that actually exist in src-converted/base/. CI syntax-check job now passes locally on all six sanity-check files (main, myopen, volkey, algevl, evldx, errgro). Clears preexisting CI red that had been in place since PR #118 upstream sync (commit 4c33325). Bumps version to 2026.04.2 to trigger Zenodo ingestion of the repaired release.
1 parent c8c1d20 commit 52ae7f1

4 files changed

Lines changed: 522 additions & 505 deletions

File tree

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,23 @@ project adheres to calendar-based versioning (YYYY.MM).
1616
(`conus-variant` branch with Greg Johnson).
1717
- Ingrowth submodel and crown ratio revision for the next calendar tag.
1818

19+
## [2026.04.2] — 2026-04-13
20+
21+
### Fixed
22+
- `src-converted/base/CONTRL.f90`: stripped CRLF line terminators and
23+
converted fixed-form continuation (` &` in column 6) to free-form
24+
trailing `&`. The file is consumed by 40+ base modules via `INCLUDE`,
25+
so the defect cascaded to `volkey.f90` and `evldx.f90` under the
26+
`gfortran -ffree-form` CI sanity check.
27+
- `src-converted/base/errgro.f90`: renamed legacy `INCLUDE 'PRGPRM.F77'`,
28+
`'CONTRL.F77'`, and `'PLOT.F77'` references to the actual `.f90`
29+
include targets in the tree, and applied the same CRLF and
30+
continuation fixes as CONTRL.
31+
- CI `syntax-check` job in `.github/workflows/ci.yml` now passes on all
32+
six sanity-check base files (main, myopen, volkey, algevl, evldx,
33+
errgro). Preexisting CI red since the PR #118 upstream sync is
34+
cleared.
35+
1936
## [2026.04.1] — 2026-04-13
2037

2138
### Fixed

CITATION.cff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ authors:
1010
repository-code: "https://github.com/holoros/fvs-modern"
1111
license: MIT
1212
license-url: "https://github.com/holoros/fvs-modern/blob/main/LICENSE"
13-
version: "2026.04.1"
13+
version: "2026.04.2"
1414
date-released: "2026-04-13"
1515
# Repository is dual-licensed: MIT for original Python, R, and deployment
1616
# code; CC0-1.0 for the USDA FVS Fortran source inherited from upstream.

0 commit comments

Comments
 (0)