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

Jump to bottom

402 merge from am3 params #404

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

402 merge from am3 params #404

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e0642e9
coupled - this appliation directory SHOULD have nothing to do with th…
JhanSrbinovsky Aug 14, 2024
042cc34
manually merge changes from AM3
JhanSrbinovsky Aug 14, 2024
b5bf063
add ice_cable index to grid_constants
JhanSrbinovsky Aug 14, 2024
7357d0a
Merge remote-tracking branch 'origin/363_params' into 402-merge-from-…
JhanSrbinovsky Sep 17, 2024
ce268a7
aliased constant
JhanSrbinovsky Sep 17, 2024
79504d2
merged update trunk to incl 8f62897b6ff6d283565d5df374271425dbce93c7
JhanSrbinovsky Sep 30, 2024
d2d4610
move definition of nCNPpool_tile TYPE members dimensions to coupled/
JhanSrbinovsky Oct 4, 2024
e089037
offline define parameters which in JAC are read through
JhanSrbinovsky Oct 6, 2024
aa6f453
Merge branch '412-initialize-dimensions-of-cnp-pools-following-am3' i…
JhanSrbinovsky Oct 7, 2024
7fef241
not strictly needed for offline to work - however corresponding mod to
JhanSrbinovsky Oct 7, 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: 1 addition & 1 deletion src/offline/cable_parameters.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2474,7 +2474,7 @@ SUBROUTINE consistency_ice_veg_soil(soil, veg)
! Ensure that when an active patch has a veg type of ice then its soil type is also ice and vice versa
! Any change effected to enforce this consistency includes correcting the appropriate paramter values

USE grid_constants_mod_cbl, ONLY : ICE_SoilType, ICE_VegType
USE grid_constants_mod_cbl, ONLY : ICE_SoilType, ICE_VegType => ice_cable
USE cable_phys_constants_mod, ONLY : csice, density_ice

TYPE (soil_parameter_type), INTENT(INOUT) :: soil ! soil parameter data
Expand Down
16 changes: 5 additions & 11 deletions src/params/cable_other_constants_mod.F90
View file
Open in desktop
JhanSrbinovsky marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ MODULE cable_other_constants_mod
!-----------------------------------------------------------------------------
!CABLE science not yet in JAC uses msn to describe number of snow layers
USE grid_constants_mod_cbl, ONLY: nrb, nsl, nsCs, nvCs, msn => nsnl
USE grid_constants_mod_cbl, ONLY: n_soiltypes => nsoil_max ! # of soil types [9]
USE grid_constants_mod_cbl, ONLY: niter ! # iterations za/L
USE grid_constants_mod_cbl, ONLY: mf !sunlit/shaded leaves
USE grid_constants_mod_cbl, ONLY: swb ! 2 shortwave bands (VIS,NIR)

IMPLICIT NONE

Expand All @@ -28,17 +32,7 @@ MODULE cable_other_constants_mod
REAL, PARAMETER :: rad_thresh = 0.001 ! min. zenithal angle for downward SW
REAL, PARAMETER :: lai_thresh = 0.001 ! min. LAI to be considered as vegetated

INTEGER, PARAMETER :: &
swb = 2, & ! 2 shortwave bands (initial division - visible /
! near infrared)
n_sw_bands = 4, & ! total number of shortwave radiation bands
! (above divided into direct / diffuse)
mf = 2, & ! types of leaves (sunlit / shaded)
r_2 = SELECTED_REAL_KIND(12, 50), &!this will be removed
! double precision real dimension
niter = 4, & ! number of iterations for za/L
n_assim_rates = 3, & ! Rubisco, RuBP and Sink-limited rates of photosynthesis
n_soiltypes = 9 ! number of soil types
INTEGER, PARAMETER :: r_2 = KIND(1.d0) ! SELECTED_REAL_KIND(12, 50)

REAL, PARAMETER :: &
max_snow_depth = 50000.0, & ! maximum depth of lying snow on tiles (kg/m2)
Expand Down
17 changes: 11 additions & 6 deletions src/params/grid_constants_cbl.F90
View file
Open in desktop
JhanSrbinovsky marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
!#define UM_CBL YES
!******************************************************************************
! This source code is part of the Community Atmosphere Biosphere Land Exchange
! (CABLE) model. This work is licensed under the CSIRO Open Source Software
Expand Down Expand Up @@ -45,12 +46,16 @@ MODULE grid_constants_mod_cbl
INTEGER, PARAMETER :: nsCs = 2 ! # soil carbon stores
INTEGER, PARAMETER :: nvCs = 3 ! # vegetation carbon stores
INTEGER, PARAMETER :: ICE_SoilType = 9 ! SoilType Index (soilparm_cable.nml JAC)
INTEGER, PARAMETER :: lakes_cable = 16! SoilType Index (soilparm_cable.nml JAC)

INTEGER, PARAMETER :: ICE_VegType = 17 ! permanent ice index for veg

INTEGER, PARAMETER :: mf = 2 ! # leaves (sunlit, shaded)
INTEGER, PARAMETER :: niter = 4 ! number of iterations for za/L
#ifndef UM_CBL
INTEGER, PARAMETER :: lakes_cable = 16 ! cable_surface_type (nml) Index
INTEGER, PARAMETER :: ice_cable = 17 ! cable_surface_type (nml) Index
#endif
JhanSrbinovsky marked this conversation as resolved.
Show resolved Hide resolved
INTEGER, PARAMETER :: mf = 2 ! # leaves (sunlit, shaded)
INTEGER, PARAMETER :: niter = 4 ! number of iterations for za/L
INTEGER, PARAMETER :: swb = 2 ! # SW bands (VIS+NIR) - CM3 alloc TYPEs
INTEGER, PARAMETER :: nCpool_casa = 10
INTEGER, PARAMETER :: nNpool_casa = 10
INTEGER, PARAMETER :: nPPool_casa = 12
JhanSrbinovsky marked this conversation as resolved.
Show resolved Hide resolved

! Strictly NOT a constant. # of active tiles, length of CABLE working vectors
INTEGER :: mp
Expand Down
2 changes: 1 addition & 1 deletion src/util/cable_runtime_opts_mod.F90
View file
Open in desktop
JhanSrbinovsky marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MODULE cable_runtime_opts_mod
!jhan:make this logical
CHARACTER(LEN=3) :: diag_soil_resp=''

CHARACTER(LEN=20) :: fwsoil_switch=''
CHARACTER(LEN=20) :: fwsoil_switch='standard'

! Ticket #56
!jhan:options?
Expand Down
Loading