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

exterminate cable_data #450

Merged
merged 4 commits into from
Nov 21, 2024
Merged

exterminate cable_data #450

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef30806
exterminate cable_data
JhanSrbinovsky Oct 30, 2024
eb2912a
review updates
JhanSrbinovsky Nov 4, 2024
21cecea
Merge branch 'main' into 448-remove-cable_data
JhanSrbinovsky Nov 18, 2024
b3c7822
Merge branch 'main' into 448-remove-cable_data
JhanSrbinovsky Nov 19, 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
14 changes: 3 additions & 11 deletions src/coupled/ESM1.5/CABLEfilesFromESM1.5/cable_cbm.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,9 @@ SUBROUTINE cbm( dels, air, bgc, canopy, met, &
USE cable_def_types_mod
USE cable_roughness_module
USE cable_air_module
#ifndef NO_CASA_YET
USE casadimension, only : icycle ! used in casa_cnp
#endif
USE cable_data_module, ONLY : icbm_type, point2constants
USE casadimension, ONLY: icycle
USE cable_phys_constants_mod, ONLY: GRAV, CAPP

!ptrs to local constants
TYPE( icbm_type ) :: C
! CABLE model variables
TYPE (air_type), INTENT(INOUT) :: air
TYPE (bgc_pool_type), INTENT(INOUT) :: bgc
Expand Down Expand Up @@ -69,15 +65,11 @@ SUBROUTINE cbm( dels, air, bgc, canopy, met, &
LOGICAL :: jls_radiation= .FALSE.
LOGICAL :: cbl_standalone = .FALSE.


! assign local ptrs to constants defined in cable_data_module
CALL point2constants(C)

cable_runtime%um_radiation = .FALSE.

IF( cable_runtime%um_explicit ) THEN
CALL ruff_resist( veg, rough, ssnow, canopy, veg%vlai, veg%hc, canopy%vlaiw )
met%tk = met%tk + C%grav/C%capp*(rough%zref_tq + 0.9*rough%z0m)
met%tk = met%tk + GRAV/CAPP*(rough%zref_tq + 0.9*rough%z0m)
ENDIF

CALL define_air (met, air)
Expand Down
Loading
Loading