Changes imports for separate FMSconstants module

NOAA-GFDL · Apr 29, 2021 · 283a7e1 · 283a7e1
1 parent bedb367
commit 283a7e1
Showing 10 changed files with 14 additions and 4 deletions.
diff --git a/full/atm_land_ice_flux_exchange.F90 b/full/atm_land_ice_flux_exchange.F90
@@ -69,7 +69,8 @@ module atm_land_ice_flux_exchange_mod
 #endif
 
 !! FMS
-use FMS, tfreeze_fms => tfreeze
+use FMS
+use FMSconstants
 
   implicit none
   include 'netcdf.inc'

diff --git a/full/atmos_ocean_fluxes_calc.F90 b/full/atmos_ocean_fluxes_calc.F90
@@ -20,7 +20,8 @@
 !
 module atmos_ocean_fluxes_calc_mod
 
-  use FMS, epsln_fms=>epsln
+  use FMS
+  use FMSconstants
 
   implicit none
   private

diff --git a/full/coupler_main.F90 b/full/coupler_main.F90
@@ -314,6 +314,7 @@ program coupler_main
   use omp_lib
 
   use FMS, status_fms=>status
+  use FMSconstants
 
   !< Can't get rid of this until fms_io is no longer used at all
   use fms_io_mod,              only: fms_io_exit

diff --git a/full/flux_exchange.F90 b/full/flux_exchange.F90
@@ -504,7 +504,8 @@ module flux_exchange_mod
 !REDIST: same grid, transfer in index space only
 !DIRECT: same grid, same decomp, direct copy
 
-  use FMS, tfreeze_fms => tfreeze
+  use FMS
+  use FMSconstants, tfreeze_fms => tfreeze
 
 !! Components
   use land_model_mod,             only: Lnd_stock_pe

diff --git a/full/ice_ocean_flux_exchange.F90 b/full/ice_ocean_flux_exchange.F90
@@ -22,6 +22,7 @@ module ice_ocean_flux_exchange_mod
 
 !! FMS
   use FMS
+  use FMSconstants
 !! Components
   use ice_model_mod,       only: ice_data_type, ocean_ice_boundary_type
   use ocean_model_mod,     only: ocean_public_type, ice_ocean_boundary_type

diff --git a/full/land_ice_flux_exchange.F90 b/full/land_ice_flux_exchange.F90
@@ -22,6 +22,7 @@ module land_ice_flux_exchange_mod
 
 !! FMS
   use FMS
+  use FMSconstants
 !! Components
   use land_model_mod,      only: land_data_type
   use ice_model_mod,       only: ice_data_type, land_ice_boundary_type

diff --git a/shared/surface_flux.F90 b/shared/surface_flux.F90
@@ -113,7 +113,8 @@
 !! </table
 module surface_flux_mod
 
-use FMS, kappa_fms=>kappa, epsln_fms=>epsln
+use FMS
+use FMSconstants, kappa_fms=>kappa, epsln_fms=>epsln
 
 implicit none
 private

diff --git a/simple/coupler_main.F90 b/simple/coupler_main.F90
@@ -60,6 +60,7 @@ program coupler_main
                               !flux_exchange_end       ! may not be used?
 !--- FMS modules
 use FMS
+use FMSconstants
 
 !--- FMS old io
 use fms_io_mod, only: fms_io_exit!< This can't be removed until fms_io is not used at all

diff --git a/simple/flux_exchange.F90 b/simple/flux_exchange.F90
@@ -32,6 +32,7 @@ module flux_exchange_mod
 
 !! FMS
 use FMS
+use FMSconstants
 
 implicit none
 private

diff --git a/simple/ice_model.F90 b/simple/ice_model.F90
@@ -28,6 +28,7 @@ module ice_model_mod
 
 !! FMS
 use FMS, sst_anom_fms=>sst_anom
+use FMSconstants
 
 implicit none
 private
-Original file line number
+Diff line change
@@ @@ -32,6 +32,7 @@ module flux_exchange_mod @@
     !! FMS
     use FMS
+    use FMSconstants
     implicit none
     private