Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes to build and run in GEOS #300

Merged
merged 3 commits into from
Dec 20, 2024
Merged

Fixes to build and run in GEOS #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73e3bf4
Fix F77 formatting in dustdead extension (.F not .F90)
lizziel Dec 20, 2024
d9a117e
Remove print of ThisDiagn%MassScal which is never set in the model
lizziel Dec 20, 2024
e61ab90
Update changelog
lizziel Dec 20, 2024
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed
- Fixed excessive prints when using MPI
- Fixed F77 formating in hcox_dustdead_mod.F

### Removed
- Removed warnings count in HcoState%Config%Err
- Removed RC argument in HCO_WARNING
- Deleted subroutine HCO_IsVerb
- Remove print of HcoDiagn%MassScal since never set in the model

## [3.10.0] - 2024-11-07
### Added
Expand Down
2 changes: 0 additions & 2 deletions src/Core/hco_diagn_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1109,8 +1109,6 @@ SUBROUTINE Diagn_Create( HcoState, cName, &
IF ( HcoState%Config%doVerbose ) THEN
WRITE(MSG, *) ' ThisDiagn%AreaScal = ', ThisDiagn%AreaScal
CALL HCO_MSG( msg, LUN=HcoState%Config%hcoLogLUN )
WRITE(MSG, *) ' ThisDiagn%MassScal = ', ThisDiagn%MassScal
CALL HCO_MSG( msg, LUN=HcoState%Config%hcoLogLUN )
ENDIF
!----------------------------------------------------------------
! Determine the normalization factors applied to the diagnostics
Expand Down
4 changes: 3 additions & 1 deletion src/Extensions/hcox_dustdead_mod.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5864,7 +5864,9 @@ SUBROUTINE ReadTuningFactor(HcoState, TuningTable, FCT, RC )
FNDLABEL = TRIM(CSLABEL)
IF ( .NOT. HcoState%Grid%AREA_M2%Alloc ) THEN
MSG = 'Warning: AREA_M2 not found, will use default number'
IF ( HcoState%Config%doVerbose ) CALL HCO_WARNING( MSG, THISLOC=LOC )
IF ( HcoState%Config%doVerbose ) THEN
CALL HCO_WARNING( MSG, THISLOC=LOC )
ENDIF
ELSE
AM2 = SUM(HcoState%Grid%AREA_M2%Val)/(HcoState%NX*HcoState%NY)
RES = SQRT(AM2)
Expand Down