Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
0bd70bd
Updated gitmodules and for feature/aqm_canopy
drnimbusrain Sep 28, 2022
d831fcd
Changed ccpp-physics submodule to GMU-SESS-AQ org for now.
drnimbusrain Sep 28, 2022
6e5f1b2
Reverted back to noaa-oar-arl submodule for aqm_canopy.
drnimbusrain Sep 28, 2022
877fe1c
Updated ccpp-physics submodule for hedmf
drnimbusrain Sep 29, 2022
0818ab1
Updated ccpp/physics submodule
drnimbusrain Dec 5, 2022
272ebf3
Updated gitmodules for noaa-oar-arl fork.
drnimbusrain Dec 15, 2022
e8d3584
Updated .gitmodule to our noaa-oar-arl fork.
drnimbusrain Dec 15, 2022
9c9b25c
Updated submodules
drnimbusrain Jan 27, 2023
625989a
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain Feb 10, 2023
3af7403
Updated submodule ccpp-physics
drnimbusrain Feb 10, 2023
2f8e62d
Updated ccpp-physics submodule.
drnimbusrain Feb 10, 2023
46979f0
Merge branch 'develop' into feature/aqm_canopy
drnimbusrain Feb 11, 2023
a54ecd8
Updating ccpp submodules.
drnimbusrain Feb 11, 2023
0cc41af
Updated ccpp-physics submodule.
drnimbusrain Feb 11, 2023
c520b97
Merge branch 'develop' of https://github.com/noaa-oar-arl/fv3atm into…
drnimbusrain Feb 11, 2023
9120189
Merging develop into aqm_canopy
drnimbusrain Feb 11, 2023
7fff457
Updated ccpp-physcis submodule.
drnimbusrain Feb 12, 2023
4925fc3
Updated ccpp-physics submodule for bugs
drnimbusrain Feb 12, 2023
ae10dd5
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain Mar 3, 2023
25aa1c6
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain Mar 7, 2023
776c183
Merge remote-tracking branch 'origin/develop' into feature/aqm_canopy
drnimbusrain Mar 7, 2023
2de3356
Updated ccpp-physics submodule for aqm_canopy
drnimbusrain Mar 7, 2023
eebcdcc
Updated ccpp/framework for arl develop
drnimbusrain Mar 7, 2023
835b652
Added do_canopy option.
drnimbusrain Mar 8, 2023
128edc8
Updating ccpp-physics submodule for do_canopy
drnimbusrain Mar 8, 2023
916254a
Updated ccpp-physics submodule for bug.
drnimbusrain Mar 8, 2023
2bdfe0e
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain Mar 16, 2023
4506835
Updated submodule for aqm_canopy layer changes.
drnimbusrain Mar 23, 2023
8221a8e
Updated submodule for ccpp canopy changes to zi.
drnimbusrain Mar 24, 2023
ddc135c
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain Mar 27, 2023
a51dcf0
Merge branch 'develop' into feature/aqm_canopy
drnimbusrain Mar 28, 2023
5c34d6a
Updated ccpp/physics submodule for aqm_canopy.
drnimbusrain Mar 28, 2023
866673a
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain Mar 28, 2023
d4b4fc0
Merge branch 'NOAA-EMC:develop' into feature/aqm_canopy
drnimbusrain Mar 28, 2023
e4a7b8b
Removed conflicts from develop to aqm_canopy.
drnimbusrain Mar 28, 2023
7dde4c1
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain May 31, 2023
d28eae9
Merge remote-tracking branch 'origin' into feature/aqm_canopy
drnimbusrain May 31, 2023
51027e6
Merge branch 'develop' into feature/aqm_canopy
drnimbusrain May 31, 2023
29c2431
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain Jun 30, 2023
01e1e48
Merge remote-tracking branch 'upstream/develop' into develop
zmoon Jul 6, 2023
bce4c9b
Merge branch 'develop' into feature/aqm_canopy
drnimbusrain Jul 7, 2023
af54a10
Merge branch 'NOAA-EMC:develop' into feature/aqm_canopy
drnimbusrain Jul 7, 2023
8f8b2d3
Updating submodules.
drnimbusrain Jul 7, 2023
6f71860
Merge branch 'feature/aqm_canopy' of https://github.com/noaa-oar-arl/…
drnimbusrain Jul 7, 2023
35287a3
Merge branch 'NOAA-EMC:develop' into develop
zmoon Jul 7, 2023
ce67d1c
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain Jul 17, 2023
eef6593
Merge branch 'develop' into feature/aqm_canopy
drnimbusrain Jul 17, 2023
7e5e5b8
Updated ccpp-physics submodule.
drnimbusrain Jul 17, 2023
6648685
Updated do_canopy flags to include units etc.
drnimbusrain Jul 18, 2023
5a74f65
Fixed do_canopy argument syntax due to upstream changes.
Jul 18, 2023
eb13b11
Reverting upp submodule hash to develop.
Jul 18, 2023
ae97c6f
Adding inital canopy variables to GFS_typdefs.meta
drnimbusrain Oct 3, 2023
425771e
Fixed units of canopyffrac and canopyclu in GFS meta.
drnimbusrain Oct 3, 2023
925ca94
Added canopy variables to GFS typdefs and diagnostic codes.
drnimbusrain Oct 4, 2023
0b1c2a0
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain Nov 16, 2023
dbbfa0b
Merge branch 'develop' into feature/aqm_canopy
drnimbusrain Nov 16, 2023
b3a7c94
Updating ccpp-physics submodule
drnimbusrain Nov 16, 2023
bd6b4b8
Added ozphys_2015 scheme back to suite_FV3_GFS_v16.xml
drnimbusrain Nov 23, 2023
b27a529
Removed ozphys_2015 in GFSv16 physics suite file.
drnimbusrain Nov 27, 2023
00baafe
Changed ffrac to frt
drnimbusrain Dec 18, 2023
1e64e8e
Updating ccpp-physics submodule for feature/aqm_canopy
drnimbusrain Dec 19, 2023
4f4f5b5
Changed ffrac to frt
drnimbusrain Dec 19, 2023
74c9ea5
Updated ccpp-physics submodule for aqm_canopy
drnimbusrain Dec 19, 2023
2168aca
Import 5 canopy arrays and 3 photdiag arrays from AQM
iri01 Feb 14, 2024
ead383c
Add diagnostics for coupled air quality model 3 canopy arrays and 3 p…
iri01 Feb 27, 2024
5a3ec8e
Comment out unused canopy arrays
iri01 Feb 28, 2024
610593f
Merge pull request #1 from noaa-oar-arl/feature/aqm_canopy_new
iri01 Feb 28, 2024
2551923
Updating ccpp-physics submodule for feature/aqm_canopy
drnimbusrain Mar 1, 2024
495574b
Update fv3atm for ccpp-physics submodule (fix to canopy arrays intent)
iri01 Mar 1, 2024
41e177b
Merge branch 'feature/aqm_canopy' of https://github.com/noaa-oar-arl/…
iri01 Mar 2, 2024
2c7423e
Updating ccpp-physics submodule for add intent = in/out in canopy var…
drnimbusrain Mar 3, 2024
5608049
Updated cpopu units to match ccpp-physics meta definitions.
drnimbusrain Mar 3, 2024
0aea978
Updated ccpp-physis for feature/aqm_canopy units changes.
drnimbusrain Mar 3, 2024
9af8766
Updated submodule for feature/aqm_canopy naux2d and naux3d changes.
drnimbusrain Mar 3, 2024
3e08719
Merge branch 'feature/aqm_canopy' of https://github.com/noaa-oar-arl/…
iri01 Mar 4, 2024
0183d43
Change canopy vars type to GFS_diag_type (formerly GFS_sfcprop_type).
iri01 Mar 4, 2024
476adf0
Merge pull request #3 from noaa-oar-arl/feature/aqm_canopy_new_diag
iri01 Mar 4, 2024
bb1bd25
Update ccpp-physics submodule for canopy bugfix.
drnimbusrain Apr 4, 2024
54b9dd8
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain May 2, 2024
cfa7fcb
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain May 13, 2024
e8701c2
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain Sep 18, 2024
d5ef1f3
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain Feb 6, 2025
aa35f23
Rolling back gitmodules in develop.
drnimbusrain Feb 6, 2025
9ba987d
Change to authoritative repos.
drnimbusrain Feb 6, 2025
4326cf2
Merge branch 'develop' into feature/aqm_canopy
drnimbusrain Feb 6, 2025
14f26d7
Updating ccpp-physics submodule to feature/aqm_canopy2
drnimbusrain Feb 6, 2025
babad81
Fixed cpopu units for canopy work.
drnimbusrain Feb 10, 2025
d1960ad
Updated ccpp-physics submodule.
drnimbusrain Feb 10, 2025
0951a82
Updating ccpp-physics submodule.
drnimbusrain Feb 10, 2025
b6523c7
Updated canopy diagnostics.
drnimbusrain Feb 12, 2025
d22c3eb
Updated canopy diagnostics again.
drnimbusrain Feb 12, 2025
af743e1
Updating .gitmodules to use older upp hash
drnimbusrain Feb 12, 2025
407082c
Reverting upp to develop branch.
drnimbusrain Feb 12, 2025
d502635
Clean up unused (obsolete) canopy fields
iri01 Feb 24, 2025
af0433b
Bugfix handling of the canopy fields
iri01 Feb 26, 2025
5547c50
Correct units of cpopu canopy data.
iri01 Mar 1, 2025
ddb5de6
Updated canopy variable units.
drnimbusrain Mar 2, 2025
378327f
Updating ccpp-physics for canopy cleanup etc.
drnimbusrain Mar 2, 2025
2ed895d
Updated ccpp-physics submodule for pi, intent=in
drnimbusrain Mar 3, 2025
a355021
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain Mar 27, 2025
f2cd16a
Merge branch 'develop' into feature/aqm_canopy
drnimbusrain Mar 27, 2025
9b88513
Commenting out canopy print statements.
drnimbusrain Mar 27, 2025
2b6d0d2
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain May 2, 2025
2229fca
Merge branch 'develop' into feature/aqm_canopy
grantfirl May 2, 2025
72107e6
fix compilation error in GFS_diagnostics.F90 after merging top-of-dev…
grantfirl May 2, 2025
2d33a0a
fix another compilation error in GFS_diagnostics.F90 and add active a…
grantfirl May 7, 2025
f59b6cf
add new canopy variable dependence on do_canopy
grantfirl May 8, 2025
b6ecda1
add do_canopy dependence
grantfirl May 8, 2025
ca5c8b4
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain May 9, 2025
42f53cc
Merge branch 'NOAA-EMC:develop' into feature/aqm_canopy
drnimbusrain May 9, 2025
527b2e6
Merge branch 'develop' into feature/aqm_canopy
grantfirl May 16, 2025
aab1fea
Updating ccpp/physics submodule for canopy.
drnimbusrain May 19, 2025
dbe6bcc
Updating ccpp/physics submodule for ufs/dev to feature/aqm_canopy2 me…
drnimbusrain Jul 7, 2025
701d312
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain Jul 7, 2025
7d5bed0
Merge branch 'develop' into feature/aqm_canopy
drnimbusrain Jul 7, 2025
de1513a
Add back 'pi' in ccpp-physics submodule for canopy.
drnimbusrain Jul 7, 2025
da3cfbc
Merge branch 'NOAA-EMC:develop' into develop
drnimbusrain Jul 15, 2025
965b275
Merge branch 'develop' into feature/aqm_canopy
drnimbusrain Jul 15, 2025
9cd1c69
Updating ccpp/physics hash
drnimbusrain Jul 15, 2025
6b49d37
update ccpp/physics hash and revert .gitmodules
BrianCurtis-NOAA Jul 17, 2025
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
59 changes: 59 additions & 0 deletions ccpp/data/GFS_typedefs.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1667,6 +1667,8 @@ module GFS_typedefs
real(kind=kind_phys) :: rhcmax ! maximum critical relative humidity, replaces rhc_max in physcons.F90
real(kind=kind_phys) :: huge !< huge fill value

!--- AQM Canopy
logical :: do_canopy !< control flag for aqm canopy effects
!--- lightning threat and diagsnostics
logical :: lightning_threat !< report lightning threat indices

Expand Down Expand Up @@ -2212,6 +2214,18 @@ module GFS_typedefs
! Diagnostics for coupled air quality model
real (kind=kind_phys), pointer :: aod (:) => null() !< instantaneous aerosol optical depth ( n/a )

!IVAI
! Diagnostics for coupled air quality model
real (kind=kind_phys), pointer :: coszens(:) => null() ! Cosine SZA for photolysis
Comment thread
BrianCurtis-NOAA marked this conversation as resolved.
real (kind=kind_phys), pointer :: jo3o1d(:) => null() ! instantaneous O3O1D photolysis rate
real (kind=kind_phys), pointer :: jno2 (:) => null() ! instantaneous NO2 photolysis rate
real (kind=kind_phys), pointer :: claie(:) => null() ! Leaf Area Index ECCC
real (kind=kind_phys), pointer :: cfch (:) => null() ! Forest Canopy Height
real (kind=kind_phys), pointer :: cfrt (:) => null() ! Forest Fraction
real (kind=kind_phys), pointer :: cclu (:) => null() ! Clumping Index
real (kind=kind_phys), pointer :: cpopu(:) => null() ! Population density
!IVAI

! Auxiliary output arrays for debugging
real (kind=kind_phys), pointer :: aux2d(:,:) => null() !< auxiliary 2d arrays in output (for debugging)
real (kind=kind_phys), pointer :: aux3d(:,:,:)=> null() !< auxiliary 2d arrays in output (for debugging)
Expand Down Expand Up @@ -4096,6 +4110,9 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
! logical :: land_iau_do_stcsmc_adjustment = .false.
! real(kind=kind_phys) :: land_iau_min_T_increment = 0.0001

!--- switch for aqm canopy effects
logical :: do_canopy = .false. !< flag for canopy option

!--- END NAMELIST VARIABLES

NAMELIST /gfs_physics_nml/ &
Expand Down Expand Up @@ -4255,6 +4272,8 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
!--- (DFI) time ranges with radar-prescribed microphysics tendencies
! and (maybe) convection suppression
fh_dfi_radar, radar_tten_limits, do_cap_suppress, &
! aqm canopy option
do_canopy, &
!--- GSL lightning threat indices
lightning_threat !, &
! !--- land_iau_nml
Expand Down Expand Up @@ -5229,6 +5248,9 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
Model%do_spp = do_spp
Model%n_var_spp = n_var_spp

!--- aqm canopy effects in physics
Model%do_canopy = do_canopy

if (Model%lndp_type/=0) then
allocate (Model%lndp_var_list(Model%n_var_lndp))
allocate (Model%lndp_prt_list(Model%n_var_lndp))
Expand Down Expand Up @@ -7183,6 +7205,7 @@ subroutine control_print(Model)
print *, ' first_time_step : ', Model%first_time_step
print *, ' restart : ', Model%restart
print *, ' lsm_cold_start : ', Model%lsm_cold_start
print *, ' do_canopy : ', Model%do_canopy
print *, ' '
print *, 'lightning threat indexes'
print *, ' lightning_threat : ', Model%lightning_threat
Expand Down Expand Up @@ -8107,6 +8130,42 @@ subroutine diag_create (Diag, Model)
Diag%aod = zero
end if

!IVAI:
! Air quality diagnostics
! -- initialize diagnostic variables
if (Model%cplaqm) then

!IVAI: photdiag arrays
allocate (Diag%coszens(IM))
Diag%coszens= zero

allocate (Diag%jo3o1d(IM))
Diag%jo3o1d = zero

allocate (Diag%jno2(IM))
Diag%jno2 = zero

!IVAI: canopy arrays read via aqm_emis_read
if (Model%do_canopy) then
allocate (Diag%claie(IM))
Diag%claie = zero

allocate (Diag%cfch (IM))
Diag%cfch = zero

allocate (Diag%cfrt (IM))
Diag%cfrt = zero

allocate (Diag%cclu (IM))
Diag%cclu = zero

allocate (Diag%cpopu (IM))
Diag%cpopu = zero
end if! (Model%do_canopy)

end if ! (Model%cplaqm)
!IVAI

! Auxiliary arrays in output for debugging
if (Model%naux2d>0) then
allocate (Diag%aux2d(IM,Model%naux2d))
Expand Down
47 changes: 46 additions & 1 deletion ccpp/data/GFS_typedefs.meta
Original file line number Diff line number Diff line change
Expand Up @@ -7765,6 +7765,12 @@
units = flag
dimensions = ()
type = logical
[do_canopy]
standard_name = flag_for_canopy_option
long_name = flag for in-canopy eddy diffusivity adjustment option
units = flag
dimensions = ()
type = logical
[clm_lake_depth_default]
standard_name = default_lake_depth_in_clm_lake_model
long_name = default lake depth in clm lake model
Expand Down Expand Up @@ -7796,7 +7802,6 @@
units = count
dimensions = ()
type = integer

########################################################################
[ccpp-table-properties]
name = GFS_grid_type
Expand Down Expand Up @@ -8735,6 +8740,46 @@
dimensions = (horizontal_dimension,number_of_diagnostics_variables_for_radiation)
type = real
kind = kind_phys
[claie]
standard_name = canopy_leaf_area_index
long_name = canopy leaf area index
units = none
dimensions = (horizontal_dimension)
type = real
kind = kind_phys
active = (flag_for_air_quality_coupling .and. flag_for_canopy_option)
[cfch]
standard_name = canopy_forest_height
long_name = canopy forest height
units = m
dimensions = (horizontal_dimension)
type = real
kind = kind_phys
active = (flag_for_air_quality_coupling .and. flag_for_canopy_option)
[cfrt]
standard_name = canopy_forest_fraction
long_name = canopy forest fraction
units = none
dimensions = (horizontal_dimension)
type = real
kind = kind_phys
active = (flag_for_air_quality_coupling .and. flag_for_canopy_option)
[cclu]
standard_name = canopy_clumping_index
long_name = canopy clumping index
units = none
dimensions = (horizontal_dimension)
type = real
kind = kind_phys
active = (flag_for_air_quality_coupling .and. flag_for_canopy_option)
[cpopu]
standard_name = canopy_population_density
long_name = population density used for canopy correction
units = km-2
dimensions = (horizontal_dimension)
type = real
kind = kind_phys
active = (flag_for_air_quality_coupling .and. flag_for_canopy_option)
[topfsw]
standard_name = sw_fluxes_top_atmosphere
long_name = sw radiation fluxes at toa
Expand Down
93 changes: 92 additions & 1 deletion ccpp/driver/GFS_diagnostics.F90
Original file line number Diff line number Diff line change
Expand Up @@ -777,6 +777,97 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
endif
endif

!IVAI
!--- air quality diagnostics ---
if (Model%cplaqm) then

! IVAI: photdiag fields
if (associated(IntDiag%coszens)) then
idx = idx + 1
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'COSZENS'
ExtDiag(idx)%desc = 'Cosine Solar Zenith Angle for Photolysis'
ExtDiag(idx)%unit = 'numerical'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%data%var2 => IntDiag%coszens(:)
endif

if (associated(IntDiag%jo3o1d)) then
idx = idx + 1
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'JO3O1D'
ExtDiag(idx)%desc = 'photolysis rate O3 for canopy correction'
ExtDiag(idx)%unit = 'min-1'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%data%var2 => IntDiag%jo3o1d(:)
endif

if (associated(IntDiag%jno2)) then
idx = idx + 1
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'JNO2'
ExtDiag(idx)%desc = 'photolysis rate NO2 for canopy correction'
ExtDiag(idx)%unit = 'min-1'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%data%var2 => IntDiag%jno2(:)
endif

!IVAI: canopy arrays read via aqm_emis_read
if (Model%do_canopy) then
if (associated(IntDiag%claie)) then
idx = idx + 1
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'CLAIE'
ExtDiag(idx)%desc = 'Leaf Area Index ECCC'
ExtDiag(idx)%unit = 'numerical'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%data%var2 => IntDiag%claie(:)
endif

if (associated(IntDiag%cfch)) then
idx = idx + 1
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'CFCH'
ExtDiag(idx)%desc = 'Forest Canopy Height'
ExtDiag(idx)%unit = 'm'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%data%var2 => IntDiag%cfch(:)
endif

if (associated(IntDiag%cfrt)) then
idx = idx + 1
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'CFRT'
ExtDiag(idx)%desc = 'Forest Canopy Fraction'
ExtDiag(idx)%unit = 'numerical'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%data%var2 => IntDiag%cfrt(:)
endif

if (associated(IntDiag%cclu)) then
idx = idx + 1
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'CCLU'
ExtDiag(idx)%desc = 'Canopy Clumping Index'
ExtDiag(idx)%unit = 'numerical'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%data%var2 => IntDiag%cclu(:)
endif

if (associated(IntDiag%cpopu)) then
idx = idx + 1
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'CPOPU'
ExtDiag(idx)%desc = 'Population Density for canopy correction'
ExtDiag(idx)%unit = 'km-2'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%data%var2 => IntDiag%cpopu(:)
endif
endif ! (Model%do_canopy)

end if ! (Model%cplaqm)
!IVAI

!
!
!--- accumulated diagnostics ---
Expand Down Expand Up @@ -3740,7 +3831,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
endif

endif extended_smoke_dust_diagnostics

idx = idx + 1
ExtDiag(idx)%axes = 3
ExtDiag(idx)%name = 'ebu_smoke'
Expand Down
13 changes: 12 additions & 1 deletion cpl/module_cplfields.F90
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ module module_cplfields
FieldInfo("cpl_scalars ", "s")]

! Import Fields ----------------------------------------
integer, public, parameter :: NimportFields = 67
integer, public, parameter :: NimportFields = 67 + 3 + 5 !IVAI: add 3 inst_tracer_diag
logical, public :: importFieldsValid(NimportFields)
type(ESMF_Field), target, public :: importFields(NimportFields)

Expand All @@ -183,6 +183,17 @@ module module_cplfields
FieldInfo("inst_ice_vis_dir_albedo ", "s"), &
FieldInfo("wave_z0_roughness_length ", "s"), &
FieldInfo("inst_tracer_diag_aod ", "s"), &
!IVAI: import canopy fields from AQM component
FieldInfo("inst_tracer_diag_claie ", "s"), &
FieldInfo("inst_tracer_diag_cfch ", "s"), &
FieldInfo("inst_tracer_diag_cfrt ", "s"), &
FieldInfo("inst_tracer_diag_cclu ", "s"), &
FieldInfo("inst_tracer_diag_cpopu ", "s"), &
!IVAI: import photolysis diagnostics from AQM component
FieldInfo("inst_tracer_diag_coszens ", "s"), &
FieldInfo("inst_tracer_diag_jo3o1d ", "s"), &
FieldInfo("inst_tracer_diag_jno2 ", "s"), &
!IVAI
FieldInfo("ocn_current_zonal ", "s"), &
FieldInfo("ocn_current_merid ", "s"), &

Expand Down
Loading