From 814a62beb3ed09ab6ccac89938c31483cb47a92b Mon Sep 17 00:00:00 2001 From: Lauren Chilutti Date: Thu, 16 Jun 2022 09:43:02 -0400 Subject: [PATCH 1/3] mixed mode emc squash commit Conflicts: driver/SHiELD/atmosphere.F90 model/fv_dynamics.F90 model/fv_update_phys.F90 model/nh_core.F90 model/nh_utils.F90 tools/fv_nggps_diag.F90 tools/test_cases.F90 --- driver/GFDL/atmosphere.F90 | 4 ++++ driver/SHiELD/atmosphere.F90 | 8 +++++++- model/fv_dynamics.F90 | 4 ++++ model/fv_nesting.F90 | 4 ++++ model/fv_update_phys.F90 | 4 ++++ model/nh_core.F90 | 4 ++++ model/nh_utils.F90 | 4 ++++ tools/coarse_grained_diagnostics.F90 | 4 ++++ tools/external_ic.F90 | 12 +++++++----- tools/fv_diagnostics.F90 | 5 +++++ tools/fv_nggps_diag.F90 | 4 ++++ tools/fv_nudge.F90 | 8 ++++++-- tools/fv_restart.F90 | 4 ++++ tools/test_cases.F90 | 4 ++++ 14 files changed, 65 insertions(+), 8 deletions(-) diff --git a/driver/GFDL/atmosphere.F90 b/driver/GFDL/atmosphere.F90 index ccab7590a..25f8b85f7 100644 --- a/driver/GFDL/atmosphere.F90 +++ b/driver/GFDL/atmosphere.F90 @@ -32,7 +32,11 @@ module atmosphere_mod !----------------- use atmos_co2_mod, only: atmos_co2_rad, co2_radiation_override 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, set_time, operator(+), & operator(-), operator(/), time_type_to_real use fms_mod, only: error_mesg, FATAL, & diff --git a/driver/SHiELD/atmosphere.F90 b/driver/SHiELD/atmosphere.F90 index 869bf2cfe..d0dfba1e4 100644 --- a/driver/SHiELD/atmosphere.F90 +++ b/driver/SHiELD/atmosphere.F90 @@ -31,7 +31,13 @@ module atmosphere_mod ! FMS modules: !----------------- use block_control_mod, only: block_control_type -use constants_mod, only: cp_air, rdgas, grav, rvgas, kappa, pstd_mks, pi +#ifdef OVERLOAD_R4 +use constantsR4_mod, only: cp_air, rdgas, grav, rvgas, kappa, pstd_mks, +pi +#else +use constants_mod, only: cp_air, rdgas, grav, rvgas, kappa, pstd_mks, +pi +#endif use time_manager_mod, only: time_type, get_time, set_time, operator(+), & operator(-), operator(/), time_type_to_real use fms_mod, only: error_mesg, FATAL, & diff --git a/model/fv_dynamics.F90 b/model/fv_dynamics.F90 index 8a36a96d7..1ffbdc364 100644 --- a/model/fv_dynamics.F90 +++ b/model/fv_dynamics.F90 @@ -19,7 +19,11 @@ !* If not, see . !*********************************************************************** module fv_dynamics_mod +#ifdef OVERLOAD_R4 + use constantsR4_mod, only: grav, pi=>pi_8, radius, hlv, rdgas, omega, rvgas, cp_vapor +#else use constants_mod, only: grav, pi=>pi_8, radius, hlv, rdgas, omega, rvgas, cp_vapor +#endif use dyn_core_mod, only: dyn_core, del2_cubed, init_ijk_mem use fv_mapz_mod, only: compute_total_energy, Lagrangian_to_Eulerian, moist_cv, moist_cp use fv_tracer2d_mod, only: tracer_2d, tracer_2d_1L, tracer_2d_nested diff --git a/model/fv_nesting.F90 b/model/fv_nesting.F90 index 495c39394..966839cab 100644 --- a/model/fv_nesting.F90 +++ b/model/fv_nesting.F90 @@ -36,7 +36,11 @@ module fv_nesting_mod use fv_arrays_mod, only: allocate_fv_nest_BC_type, fv_atmos_type, fv_grid_bounds_type, deallocate_fv_nest_BC_type use fv_grid_utils_mod, only: ptop_min, g_sum, cubed_to_latlon, f_p use init_hydro_mod, only: p_var +#ifdef OVERLOAD_R4 + use constantsR4_mod, only: grav, pi=>pi_8, radius, hlv, rdgas, cp_air, rvgas, cp_vapor, kappa +#else use constants_mod, only: grav, pi=>pi_8, radius, hlv, rdgas, cp_air, rvgas, cp_vapor, kappa +#endif use fv_mapz_mod, only: mappm, remap_2d use fv_timing_mod, only: timing_on, timing_off use fv_mp_mod, only: is_master diff --git a/model/fv_update_phys.F90 b/model/fv_update_phys.F90 index d3672defb..20991baa9 100644 --- a/model/fv_update_phys.F90 +++ b/model/fv_update_phys.F90 @@ -20,7 +20,11 @@ !*********************************************************************** module fv_update_phys_mod +#ifdef OVERLOAD_R4 + use constantsR4_mod, only: kappa, rdgas, rvgas, grav, cp_air, cp_vapor, pi=>pi_8, radius, TFREEZE +#else use constants_mod, only: kappa, rdgas, rvgas, grav, cp_air, cp_vapor, pi=>pi_8, radius, TFREEZE +#endif use field_manager_mod, only: MODEL_ATMOS use mpp_domains_mod, only: mpp_update_domains, domain2d use mpp_parameter_mod, only: AGRID_PARAM=>AGRID diff --git a/model/nh_core.F90 b/model/nh_core.F90 index 9dcd7a302..cc189e107 100644 --- a/model/nh_core.F90 +++ b/model/nh_core.F90 @@ -23,7 +23,11 @@ module nh_core_mod ! To do list: ! include moisture effect in pt !------------------------------ +#ifdef OVERLOAD_R4 + use constantsR4_mod, only: rdgas, cp_air, grav +#else use constants_mod, only: rdgas, cp_air, grav +#endif use tp_core_mod, only: fv_tp_2d use nh_utils_mod, only: update_dz_c, update_dz_d, nh_bc use nh_utils_mod, only: sim_solver, sim1_solver, sim3_solver diff --git a/model/nh_utils.F90 b/model/nh_utils.F90 index 0921b1a02..5ec8c01a4 100644 --- a/model/nh_utils.F90 +++ b/model/nh_utils.F90 @@ -23,7 +23,11 @@ module nh_utils_mod ! To do list: ! include moisture effect in pt !------------------------------ +#ifdef OVERLOAD_R4 + use constantsR4_mod, only: rdgas, cp_air, grav +#else use constants_mod, only: rdgas, cp_air, grav +#endif use tp_core_mod, only: fv_tp_2d use sw_core_mod, only: fill_4corners, del6_vt_flux use fv_arrays_mod, only: fv_grid_bounds_type, fv_grid_type, fv_nest_BC_type_3d diff --git a/tools/coarse_grained_diagnostics.F90 b/tools/coarse_grained_diagnostics.F90 index 8f910abdd..84d1bae79 100644 --- a/tools/coarse_grained_diagnostics.F90 +++ b/tools/coarse_grained_diagnostics.F90 @@ -1,6 +1,10 @@ module coarse_grained_diagnostics_mod +#ifdef OVERLOAD_R4 + use constantsR4_mod, only: rdgas, grav, pi=>pi_8 +#else use constants_mod, only: rdgas, grav, pi=>pi_8 +#endif use diag_manager_mod, only: diag_axis_init, register_diag_field, register_static_field, send_data use field_manager_mod, only: MODEL_ATMOS use fv_arrays_mod, only: fv_atmos_type, fv_coarse_graining_type diff --git a/tools/external_ic.F90 b/tools/external_ic.F90 index fd68d1fdd..63667e395 100644 --- a/tools/external_ic.F90 +++ b/tools/external_ic.F90 @@ -41,8 +41,12 @@ module external_ic_mod use tracer_manager_mod, only: get_tracer_names, get_number_tracers, get_tracer_index use tracer_manager_mod, only: set_tracer_profile use field_manager_mod, only: MODEL_ATMOS - + use platform_mod, only: r4_kind, r8_kind +#ifdef OVERLOAD_R4 + use constantsR4_mod, only: pi=>pi_8, omega, grav, kappa, rdgas, rvgas, cp_air +#else use constants_mod, only: pi=>pi_8, omega, grav, kappa, rdgas, rvgas, cp_air +#endif use fv_arrays_mod, only: fv_atmos_type, fv_grid_type, fv_grid_bounds_type, R_GRID use fv_diagnostics_mod,only: prt_maxmin, prt_gb_nh_sh, prt_height use fv_grid_utils_mod, only: ptop_min, g_sum,mid_pt_sphere,get_unit_vect2,get_latlon_vector,inner_prod @@ -1493,7 +1497,7 @@ subroutine get_ncep_ic( Atm, fv_domain, nq ) call ncep2fms(im, jm, lon, lat, wk2) if( is_master() ) then write(*,*) 'External_ic_mod: i_sst=', i_sst, ' j_sst=', j_sst - call pmaxmin( 'SST_ncep_fms', sst_ncep, i_sst, j_sst, 1.) + call pmaxmin( 'SST_ncep_fms', real(sst_ncep), i_sst, j_sst, 1.) endif #endif endif !(read_ts) @@ -3903,8 +3907,6 @@ subroutine d2a3d(u, v, ua, va, im, jm, km, lon) end subroutine d2a3d - - subroutine pmaxmin( qname, a, im, jm, fac ) integer, intent(in):: im, jm @@ -3940,7 +3942,7 @@ subroutine pmaxmin( qname, a, im, jm, fac ) end subroutine pmaxmin -subroutine pmaxmn(qname, q, is, ie, js, je, km, fac, area, domain) + subroutine pmaxmn(qname, q, is, ie, js, je, km, fac, area, domain) character(len=*), intent(in):: qname integer, intent(in):: is, ie, js, je integer, intent(in):: km diff --git a/tools/fv_diagnostics.F90 b/tools/fv_diagnostics.F90 index ac40d2c88..92a3b7e0d 100644 --- a/tools/fv_diagnostics.F90 +++ b/tools/fv_diagnostics.F90 @@ -24,8 +24,13 @@ module fv_diagnostics_mod +#ifdef OVERLOAD_R4 + use constantsR4_mod, only: grav, rdgas, rvgas, pi=>pi_8, radius, kappa, WTMAIR, WTMCO2, & + omega, hlv, cp_air, cp_vapor, TFREEZE +#else use constants_mod, only: grav, rdgas, rvgas, pi=>pi_8, radius, kappa, WTMAIR, WTMCO2, & omega, hlv, cp_air, cp_vapor, TFREEZE +#endif use fms_mod, only: write_version_number use time_manager_mod, only: time_type, get_date, get_time use mpp_domains_mod, only: domain2d, mpp_update_domains, DGRID_NE, NORTH, EAST diff --git a/tools/fv_nggps_diag.F90 b/tools/fv_nggps_diag.F90 index 8e68b2e44..bef78982a 100644 --- a/tools/fv_nggps_diag.F90 +++ b/tools/fv_nggps_diag.F90 @@ -63,7 +63,11 @@ module fv_nggps_diags_mod ! use mpp_mod, only: mpp_pe, mpp_root_pe,FATAL,mpp_error +#ifdef OVERLOAD_R4 + use constantsR4_mod, only: grav, rdgas +#else use constants_mod, only: grav, rdgas +#endif use time_manager_mod, only: time_type, get_time use diag_manager_mod, only: register_diag_field, send_data use diag_axis_mod, only: get_axis_global_length, get_diag_axis, get_diag_axis_name diff --git a/tools/fv_nudge.F90 b/tools/fv_nudge.F90 index a00d87f0f..834842a70 100644 --- a/tools/fv_nudge.F90 +++ b/tools/fv_nudge.F90 @@ -28,12 +28,17 @@ module fv_nwp_nudge_mod use external_sst_mod, only: i_sst, j_sst, sst_ncep, sst_anom, forecast_mode use diag_manager_mod, only: register_diag_field, send_data +#ifdef OVERLOAD_R4 + use constantsR4_mod, only: pi=>pi_8, grav, rdgas, cp_air, kappa, cnst_radius =>radius +#else use constants_mod, only: pi=>pi_8, grav, rdgas, cp_air, kappa, cnst_radius =>radius +#endif use fms_mod, only: write_version_number, check_nml_error use fms2_io_mod, only: file_exists use mpp_mod, only: mpp_error, FATAL, stdlog, get_unit, mpp_pe, input_nml_file use mpp_domains_mod, only: mpp_update_domains, domain2d use time_manager_mod, only: time_type, get_time, get_date + use platform_mod, only: r4_kind, r8_kind use fv_grid_utils_mod, only: great_circle_dist, intp_great_circle use fv_grid_utils_mod, only: latlon2xyz, vect_cross, normalize_vect @@ -1522,7 +1527,7 @@ subroutine get_ncep_analysis ( ps, u, v, t, q, zvir, ts, nfile, fname, bd ) #ifndef DYCORE_SOLO ! Perform interp to FMS SST format/grid call ncep2fms( wk1 ) - if(master) call pmaxmin( 'SST_ncep', sst_ncep, i_sst, j_sst, 1.) + if(master) call pmaxmin( 'SST_ncep', real(sst_ncep), i_sst, j_sst, 1.) ! if(nfile/=1 .and. master) call pmaxmin( 'SST_anom', sst_anom, i_sst, j_sst, 1.) #endif deallocate ( wk1 ) @@ -3389,7 +3394,6 @@ logical function leap_year(ny) end function leap_year - subroutine pmaxmin( qname, a, imax, jmax, fac ) character(len=*) qname diff --git a/tools/fv_restart.F90 b/tools/fv_restart.F90 index 73bbd6f4f..2287355a9 100644 --- a/tools/fv_restart.F90 +++ b/tools/fv_restart.F90 @@ -29,7 +29,11 @@ module fv_restart_mod ! for the model. ! +#ifdef OVERLOAD_R4 + use constantsR4_mod, only: kappa, pi=>pi_8, omega, rdgas, grav, rvgas, cp_air, radius +#else use constants_mod, only: kappa, pi=>pi_8, omega, rdgas, grav, rvgas, cp_air, radius +#endif use fv_arrays_mod, only: fv_atmos_type, fv_nest_type, fv_grid_bounds_type, R_GRID use fv_io_mod, only: fv_io_init, fv_io_read_restart, fv_io_write_restart, & remap_restart, fv_io_register_nudge_restart, & diff --git a/tools/test_cases.F90 b/tools/test_cases.F90 index d61d558e1..035a53d80 100644 --- a/tools/test_cases.F90 +++ b/tools/test_cases.F90 @@ -21,7 +21,11 @@ module test_cases_mod +#ifdef OVERLOAD_R4 + use constantsR4_mod, only: cnst_radius=>radius, pi=>pi_8, omega, grav, kappa, rdgas, cp_air, rvgas +#else use constants_mod, only: cnst_radius=>radius, pi=>pi_8, omega, grav, kappa, rdgas, cp_air, rvgas +#endif use init_hydro_mod, only: p_var, hydro_eq use fv_mp_mod, only: is_master, & domain_decomp, fill_corners, XDir, YDir, & From 18da4988999f145ee972cf8562641435b1f48c60 Mon Sep 17 00:00:00 2001 From: Lauren Chilutti Date: Thu, 16 Jun 2022 10:10:09 -0400 Subject: [PATCH 2/3] GNU compiler bug fix --- tools/external_ic.F90 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/external_ic.F90 b/tools/external_ic.F90 index 63667e395..0f9de10fe 100644 --- a/tools/external_ic.F90 +++ b/tools/external_ic.F90 @@ -2467,10 +2467,10 @@ subroutine get_fv_ic( Atm, fv_domain, nq ) ! Share the load if(is_master()) call pmaxmin( 'ZS_data', gz0, im, jm, 1./grav) - if(mpp_pe()==1) call pmaxmin( 'U_data', u0, im*jm, km, 1.) - if(mpp_pe()==1) call pmaxmin( 'V_data', v0, im*jm, km, 1.) - if(mpp_pe()==2) call pmaxmin( 'T_data', t0, im*jm, km, 1.) - if(mpp_pe()==3) call pmaxmin( 'DEL-P', dp0, im*jm, km, 0.01) + if(mpp_pe()==1) call pmaxmin( 'U_data', reshape(u0, (/ im*jm, km /)), im*jm, km, 1.) + if(mpp_pe()==1) call pmaxmin( 'V_data', reshape(v0, (/ im*jm, km /)), im*jm, km, 1.) + if(mpp_pe()==2) call pmaxmin( 'T_data', reshape(t0, (/ im*jm, km /)), im*jm, km, 1.) + if(mpp_pe()==3) call pmaxmin( 'DEL-P', reshape(dp0, (/ im*jm, km /)), im*jm, km, 0.01) call close_file(Latlon_dyn) else @@ -2508,8 +2508,8 @@ subroutine get_fv_ic( Atm, fv_domain, nq ) deallocate ( u0 ) deallocate ( v0 ) - if(mpp_pe()==4) call pmaxmin( 'UA', ua, im*jm, km, 1.) - if(mpp_pe()==4) call pmaxmin( 'VA', va, im*jm, km, 1.) + if(mpp_pe()==4) call pmaxmin( 'UA', reshape(ua, (/ im*jm, km /)), im*jm, km, 1.) + if(mpp_pe()==4) call pmaxmin( 'VA', reshape(va, (/ im*jm, km /)), im*jm, km, 1.) do j=1,jm do i=1,im From ec2991367269cb7a8e52b5867cb994bc24d11dab Mon Sep 17 00:00:00 2001 From: Lauren Chilutti Date: Thu, 23 Jun 2022 13:02:26 -0400 Subject: [PATCH 3/3] removing constants changes as these wont be needed on dev/gfdl --- driver/GFDL/atmosphere.F90 | 4 ---- driver/SHiELD/atmosphere.F90 | 8 +------- model/fv_dynamics.F90 | 4 ---- model/fv_nesting.F90 | 4 ---- model/fv_update_phys.F90 | 4 ---- model/nh_core.F90 | 4 ---- model/nh_utils.F90 | 4 ---- tools/coarse_grained_diagnostics.F90 | 4 ---- tools/external_ic.F90 | 4 ---- tools/fv_diagnostics.F90 | 5 ----- tools/fv_nggps_diag.F90 | 4 ---- tools/fv_nudge.F90 | 4 ---- tools/fv_restart.F90 | 4 ---- tools/test_cases.F90 | 4 ---- 14 files changed, 1 insertion(+), 60 deletions(-) diff --git a/driver/GFDL/atmosphere.F90 b/driver/GFDL/atmosphere.F90 index 25f8b85f7..ccab7590a 100644 --- a/driver/GFDL/atmosphere.F90 +++ b/driver/GFDL/atmosphere.F90 @@ -32,11 +32,7 @@ module atmosphere_mod !----------------- use atmos_co2_mod, only: atmos_co2_rad, co2_radiation_override 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, set_time, operator(+), & operator(-), operator(/), time_type_to_real use fms_mod, only: error_mesg, FATAL, & diff --git a/driver/SHiELD/atmosphere.F90 b/driver/SHiELD/atmosphere.F90 index d0dfba1e4..869bf2cfe 100644 --- a/driver/SHiELD/atmosphere.F90 +++ b/driver/SHiELD/atmosphere.F90 @@ -31,13 +31,7 @@ module atmosphere_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, -pi -#else -use constants_mod, only: cp_air, rdgas, grav, rvgas, kappa, pstd_mks, -pi -#endif +use constants_mod, only: cp_air, rdgas, grav, rvgas, kappa, pstd_mks, pi use time_manager_mod, only: time_type, get_time, set_time, operator(+), & operator(-), operator(/), time_type_to_real use fms_mod, only: error_mesg, FATAL, & diff --git a/model/fv_dynamics.F90 b/model/fv_dynamics.F90 index 1ffbdc364..8a36a96d7 100644 --- a/model/fv_dynamics.F90 +++ b/model/fv_dynamics.F90 @@ -19,11 +19,7 @@ !* If not, see . !*********************************************************************** module fv_dynamics_mod -#ifdef OVERLOAD_R4 - use constantsR4_mod, only: grav, pi=>pi_8, radius, hlv, rdgas, omega, rvgas, cp_vapor -#else use constants_mod, only: grav, pi=>pi_8, radius, hlv, rdgas, omega, rvgas, cp_vapor -#endif use dyn_core_mod, only: dyn_core, del2_cubed, init_ijk_mem use fv_mapz_mod, only: compute_total_energy, Lagrangian_to_Eulerian, moist_cv, moist_cp use fv_tracer2d_mod, only: tracer_2d, tracer_2d_1L, tracer_2d_nested diff --git a/model/fv_nesting.F90 b/model/fv_nesting.F90 index 966839cab..495c39394 100644 --- a/model/fv_nesting.F90 +++ b/model/fv_nesting.F90 @@ -36,11 +36,7 @@ module fv_nesting_mod use fv_arrays_mod, only: allocate_fv_nest_BC_type, fv_atmos_type, fv_grid_bounds_type, deallocate_fv_nest_BC_type use fv_grid_utils_mod, only: ptop_min, g_sum, cubed_to_latlon, f_p use init_hydro_mod, only: p_var -#ifdef OVERLOAD_R4 - use constantsR4_mod, only: grav, pi=>pi_8, radius, hlv, rdgas, cp_air, rvgas, cp_vapor, kappa -#else use constants_mod, only: grav, pi=>pi_8, radius, hlv, rdgas, cp_air, rvgas, cp_vapor, kappa -#endif use fv_mapz_mod, only: mappm, remap_2d use fv_timing_mod, only: timing_on, timing_off use fv_mp_mod, only: is_master diff --git a/model/fv_update_phys.F90 b/model/fv_update_phys.F90 index 20991baa9..d3672defb 100644 --- a/model/fv_update_phys.F90 +++ b/model/fv_update_phys.F90 @@ -20,11 +20,7 @@ !*********************************************************************** module fv_update_phys_mod -#ifdef OVERLOAD_R4 - use constantsR4_mod, only: kappa, rdgas, rvgas, grav, cp_air, cp_vapor, pi=>pi_8, radius, TFREEZE -#else use constants_mod, only: kappa, rdgas, rvgas, grav, cp_air, cp_vapor, pi=>pi_8, radius, TFREEZE -#endif use field_manager_mod, only: MODEL_ATMOS use mpp_domains_mod, only: mpp_update_domains, domain2d use mpp_parameter_mod, only: AGRID_PARAM=>AGRID diff --git a/model/nh_core.F90 b/model/nh_core.F90 index cc189e107..9dcd7a302 100644 --- a/model/nh_core.F90 +++ b/model/nh_core.F90 @@ -23,11 +23,7 @@ module nh_core_mod ! To do list: ! include moisture effect in pt !------------------------------ -#ifdef OVERLOAD_R4 - use constantsR4_mod, only: rdgas, cp_air, grav -#else use constants_mod, only: rdgas, cp_air, grav -#endif use tp_core_mod, only: fv_tp_2d use nh_utils_mod, only: update_dz_c, update_dz_d, nh_bc use nh_utils_mod, only: sim_solver, sim1_solver, sim3_solver diff --git a/model/nh_utils.F90 b/model/nh_utils.F90 index 5ec8c01a4..0921b1a02 100644 --- a/model/nh_utils.F90 +++ b/model/nh_utils.F90 @@ -23,11 +23,7 @@ module nh_utils_mod ! To do list: ! include moisture effect in pt !------------------------------ -#ifdef OVERLOAD_R4 - use constantsR4_mod, only: rdgas, cp_air, grav -#else use constants_mod, only: rdgas, cp_air, grav -#endif use tp_core_mod, only: fv_tp_2d use sw_core_mod, only: fill_4corners, del6_vt_flux use fv_arrays_mod, only: fv_grid_bounds_type, fv_grid_type, fv_nest_BC_type_3d diff --git a/tools/coarse_grained_diagnostics.F90 b/tools/coarse_grained_diagnostics.F90 index 84d1bae79..8f910abdd 100644 --- a/tools/coarse_grained_diagnostics.F90 +++ b/tools/coarse_grained_diagnostics.F90 @@ -1,10 +1,6 @@ module coarse_grained_diagnostics_mod -#ifdef OVERLOAD_R4 - use constantsR4_mod, only: rdgas, grav, pi=>pi_8 -#else use constants_mod, only: rdgas, grav, pi=>pi_8 -#endif use diag_manager_mod, only: diag_axis_init, register_diag_field, register_static_field, send_data use field_manager_mod, only: MODEL_ATMOS use fv_arrays_mod, only: fv_atmos_type, fv_coarse_graining_type diff --git a/tools/external_ic.F90 b/tools/external_ic.F90 index 0f9de10fe..26834105d 100644 --- a/tools/external_ic.F90 +++ b/tools/external_ic.F90 @@ -42,11 +42,7 @@ module external_ic_mod use tracer_manager_mod, only: set_tracer_profile use field_manager_mod, only: MODEL_ATMOS use platform_mod, only: r4_kind, r8_kind -#ifdef OVERLOAD_R4 - use constantsR4_mod, only: pi=>pi_8, omega, grav, kappa, rdgas, rvgas, cp_air -#else use constants_mod, only: pi=>pi_8, omega, grav, kappa, rdgas, rvgas, cp_air -#endif use fv_arrays_mod, only: fv_atmos_type, fv_grid_type, fv_grid_bounds_type, R_GRID use fv_diagnostics_mod,only: prt_maxmin, prt_gb_nh_sh, prt_height use fv_grid_utils_mod, only: ptop_min, g_sum,mid_pt_sphere,get_unit_vect2,get_latlon_vector,inner_prod diff --git a/tools/fv_diagnostics.F90 b/tools/fv_diagnostics.F90 index 92a3b7e0d..ac40d2c88 100644 --- a/tools/fv_diagnostics.F90 +++ b/tools/fv_diagnostics.F90 @@ -24,13 +24,8 @@ module fv_diagnostics_mod -#ifdef OVERLOAD_R4 - use constantsR4_mod, only: grav, rdgas, rvgas, pi=>pi_8, radius, kappa, WTMAIR, WTMCO2, & - omega, hlv, cp_air, cp_vapor, TFREEZE -#else use constants_mod, only: grav, rdgas, rvgas, pi=>pi_8, radius, kappa, WTMAIR, WTMCO2, & omega, hlv, cp_air, cp_vapor, TFREEZE -#endif use fms_mod, only: write_version_number use time_manager_mod, only: time_type, get_date, get_time use mpp_domains_mod, only: domain2d, mpp_update_domains, DGRID_NE, NORTH, EAST diff --git a/tools/fv_nggps_diag.F90 b/tools/fv_nggps_diag.F90 index bef78982a..8e68b2e44 100644 --- a/tools/fv_nggps_diag.F90 +++ b/tools/fv_nggps_diag.F90 @@ -63,11 +63,7 @@ module fv_nggps_diags_mod ! use mpp_mod, only: mpp_pe, mpp_root_pe,FATAL,mpp_error -#ifdef OVERLOAD_R4 - use constantsR4_mod, only: grav, rdgas -#else use constants_mod, only: grav, rdgas -#endif use time_manager_mod, only: time_type, get_time use diag_manager_mod, only: register_diag_field, send_data use diag_axis_mod, only: get_axis_global_length, get_diag_axis, get_diag_axis_name diff --git a/tools/fv_nudge.F90 b/tools/fv_nudge.F90 index 834842a70..bbc948662 100644 --- a/tools/fv_nudge.F90 +++ b/tools/fv_nudge.F90 @@ -28,11 +28,7 @@ module fv_nwp_nudge_mod use external_sst_mod, only: i_sst, j_sst, sst_ncep, sst_anom, forecast_mode use diag_manager_mod, only: register_diag_field, send_data -#ifdef OVERLOAD_R4 - use constantsR4_mod, only: pi=>pi_8, grav, rdgas, cp_air, kappa, cnst_radius =>radius -#else use constants_mod, only: pi=>pi_8, grav, rdgas, cp_air, kappa, cnst_radius =>radius -#endif use fms_mod, only: write_version_number, check_nml_error use fms2_io_mod, only: file_exists use mpp_mod, only: mpp_error, FATAL, stdlog, get_unit, mpp_pe, input_nml_file diff --git a/tools/fv_restart.F90 b/tools/fv_restart.F90 index 2287355a9..73bbd6f4f 100644 --- a/tools/fv_restart.F90 +++ b/tools/fv_restart.F90 @@ -29,11 +29,7 @@ module fv_restart_mod ! for the model. ! -#ifdef OVERLOAD_R4 - use constantsR4_mod, only: kappa, pi=>pi_8, omega, rdgas, grav, rvgas, cp_air, radius -#else use constants_mod, only: kappa, pi=>pi_8, omega, rdgas, grav, rvgas, cp_air, radius -#endif use fv_arrays_mod, only: fv_atmos_type, fv_nest_type, fv_grid_bounds_type, R_GRID use fv_io_mod, only: fv_io_init, fv_io_read_restart, fv_io_write_restart, & remap_restart, fv_io_register_nudge_restart, & diff --git a/tools/test_cases.F90 b/tools/test_cases.F90 index 035a53d80..d61d558e1 100644 --- a/tools/test_cases.F90 +++ b/tools/test_cases.F90 @@ -21,11 +21,7 @@ module test_cases_mod -#ifdef OVERLOAD_R4 - use constantsR4_mod, only: cnst_radius=>radius, pi=>pi_8, omega, grav, kappa, rdgas, cp_air, rvgas -#else use constants_mod, only: cnst_radius=>radius, pi=>pi_8, omega, grav, kappa, rdgas, cp_air, rvgas -#endif use init_hydro_mod, only: p_var, hydro_eq use fv_mp_mod, only: is_master, & domain_decomp, fill_corners, XDir, YDir, &