From 2c75eadbee064689d5c16dafe25589af809db2f9 Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Mon, 13 Feb 2023 20:40:57 +0000 Subject: [PATCH] Allow HAFS app to be compiled with 64bit FMS --- moving_nest/fv_moving_nest.F90 | 4 ++++ moving_nest/fv_moving_nest_main.F90 | 4 ++++ moving_nest/fv_moving_nest_physics.F90 | 4 ++++ moving_nest/fv_moving_nest_utils.F90 | 4 ++++ moving_nest/fv_tracker.F90 | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/moving_nest/fv_moving_nest.F90 b/moving_nest/fv_moving_nest.F90 index 009f04b87..6ef5ab384 100644 --- a/moving_nest/fv_moving_nest.F90 +++ b/moving_nest/fv_moving_nest.F90 @@ -72,7 +72,11 @@ module fv_moving_nest_mod use boundary_mod, only: update_coarse_grid, update_coarse_grid_mpp use bounding_box_mod, only: bbox, bbox_get_C2F_index, fill_bbox +#ifdef OVERLOAD_R4 + use constantsR4_mod, only: cp_air, omega, rdgas, grav, rvgas, kappa, pstd_mks, hlv +#else use constants_mod, only: cp_air, omega, rdgas, grav, rvgas, kappa, pstd_mks, hlv +#endif use field_manager_mod, only: MODEL_ATMOS use fv_arrays_mod, only: fv_atmos_type, fv_nest_type, fv_grid_type, R_GRID use fv_arrays_mod, only: allocate_fv_nest_bc_type, deallocate_fv_nest_bc_type diff --git a/moving_nest/fv_moving_nest_main.F90 b/moving_nest/fv_moving_nest_main.F90 index 4f1ce7aeb..34af608c2 100644 --- a/moving_nest/fv_moving_nest_main.F90 +++ b/moving_nest/fv_moving_nest_main.F90 @@ -33,7 +33,11 @@ module fv_moving_nest_main_mod ! FMS modules: !----------------- use block_control_mod, only: block_control_type +#ifdef OVERLOAD_R4 + use constantsR4_mod, only: cp_air, rdgas, grav, rvgas, kappa, pstd_mks +#else use constants_mod, only: cp_air, rdgas, grav, rvgas, kappa, pstd_mks +#endif use time_manager_mod, only: time_type, get_time, get_date, set_time, operator(+), & operator(-), operator(/), time_type_to_real use fms_mod, only: file_exist, open_namelist_file, & diff --git a/moving_nest/fv_moving_nest_physics.F90 b/moving_nest/fv_moving_nest_physics.F90 index 873964fa5..2dc6bce5b 100644 --- a/moving_nest/fv_moving_nest_physics.F90 +++ b/moving_nest/fv_moving_nest_physics.F90 @@ -68,7 +68,11 @@ module fv_moving_nest_physics_mod use GFS_init, only: GFS_grid_populate use boundary_mod, only: update_coarse_grid, update_coarse_grid_mpp +#ifdef OVERLOAD_R4 + use constantsR4_mod, only: cp_air, rdgas, grav, rvgas, kappa, pstd_mks, hlv +#else use constants_mod, only: cp_air, rdgas, grav, rvgas, kappa, pstd_mks, hlv +#endif use field_manager_mod, only: MODEL_ATMOS use fv_arrays_mod, only: fv_atmos_type, fv_nest_type, fv_grid_type, R_GRID use fv_moving_nest_types_mod, only: fv_moving_nest_prog_type, fv_moving_nest_physics_type, mn_surface_grids, fv_moving_nest_type diff --git a/moving_nest/fv_moving_nest_utils.F90 b/moving_nest/fv_moving_nest_utils.F90 index 11485aa88..06136a2b1 100644 --- a/moving_nest/fv_moving_nest_utils.F90 +++ b/moving_nest/fv_moving_nest_utils.F90 @@ -67,7 +67,11 @@ module fv_moving_nest_utils_mod use IPD_typedefs, only: kind_phys => IPD_kind_phys #endif +#ifdef OVERLOAD_R4 + use constantsR4_mod, only: grav +#else use constants_mod, only: grav +#endif use boundary_mod, only: update_coarse_grid, update_coarse_grid_mpp use bounding_box_mod, only: bbox, bbox_get_C2F_index, fill_bbox diff --git a/moving_nest/fv_tracker.F90 b/moving_nest/fv_tracker.F90 index 75c38217b..5cda9083f 100644 --- a/moving_nest/fv_tracker.F90 +++ b/moving_nest/fv_tracker.F90 @@ -26,7 +26,11 @@ module fv_tracker_mod #include +#ifdef OVERLOAD_R4 + use constantsR4_mod, only: pi=>pi_8, rad_to_deg, deg_to_rad, RVGAS, RDGAS +#else use constants_mod, only: pi=>pi_8, rad_to_deg, deg_to_rad, RVGAS, RDGAS +#endif use fms_mod, only: mpp_clock_id, CLOCK_SUBCOMPONENT, clock_flag_default, & mpp_clock_begin, mpp_clock_end use time_manager_mod, only: time_type, get_time, set_time, operator(+), &