Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 mediator/esmFldsExchange_ufs_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ subroutine esmFldsExchange_ufs(gcomp, phase, rc)
deallocate(flds)
end if

! to atm: unmerged from mediator, merge will be done under FV3/CCPP composite step
! to atm: unmerged from mediator, merge will be done under UFSATM/CCPP composite step
! - zonal surface stress, meridional surface stress
! - surface latent heat flux,
! - surface sensible heat flux
Expand Down
20 changes: 10 additions & 10 deletions ufs/ccpp/config/ccpp_prebuild_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# Query required information/s #
###############################################################################

fv3_path = os.environ['FV3_PATH']
ufsatm_path = os.environ['UFSATM_PATH']

###############################################################################
# Definitions #
Expand All @@ -24,8 +24,8 @@
# dependencies of these files to the list.
VARIABLE_DEFINITION_FILES = [
# actual variable definition files
'{}/ccpp/framework/src/ccpp_types.F90'.format(fv3_path),
'{}/ccpp/physics/physics/hooks/machine.F'.format(fv3_path),
'{}/ccpp/framework/src/ccpp_types.F90'.format(ufsatm_path),
'{}/ccpp/physics/physics/hooks/machine.F'.format(ufsatm_path),
'CMEPS/ufs/ccpp/data/MED_typedefs.F90',
'CMEPS/ufs/ccpp/data/MED_data.F90'
]
Expand Down Expand Up @@ -58,13 +58,13 @@

# Add all physics scheme files relative to basedir
SCHEME_FILES = [
'{}/ccpp/physics/physics/SFC_Models/Ocean/UFS/sfc_ocean.F'.format(fv3_path),
'{}/ccpp/physics/physics/SFC_Layer/UFS/sfc_diff.f'.format(fv3_path),
'{}/ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_loop_control_part1.F90'.format(fv3_path),
'{}/ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_loop_control_part2.F90'.format(fv3_path),
'{}/ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.F90'.format(fv3_path),
'{}/ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_post.F90'.format(fv3_path),
'{}/ccpp/physics/physics/SFC_Layer/UFS/sfc_diag.f'.format(fv3_path)
'{}/ccpp/physics/physics/SFC_Models/Ocean/UFS/sfc_ocean.F'.format(ufsatm_path),
'{}/ccpp/physics/physics/SFC_Layer/UFS/sfc_diff.f'.format(ufsatm_path),
'{}/ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_loop_control_part1.F90'.format(ufsatm_path),
'{}/ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_loop_control_part2.F90'.format(ufsatm_path),
'{}/ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.F90'.format(ufsatm_path),
'{}/ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_post.F90'.format(ufsatm_path),
'{}/ccpp/physics/physics/SFC_Layer/UFS/sfc_diag.f'.format(ufsatm_path)
]

# Default build dir, relative to current working directory,
Expand Down
2 changes: 1 addition & 1 deletion ufs/ccpp/data/MED_typedefs.meta
Original file line number Diff line number Diff line change
Expand Up @@ -1358,7 +1358,7 @@
[ccpp-table-properties]
name = MED_typedefs
type = module
relative_path = ../../../../../FV3/ccpp/physics/physics/hooks
relative_path = ../../../../../UFSATM/ccpp/physics/physics/hooks
dependencies = machine.F,physcons.F90

[ccpp-arg-table]
Expand Down