diff --git a/constants/Makefile.am b/constants/Makefile.am index b8e141a05d..429dd6c329 100644 --- a/constants/Makefile.am +++ b/constants/Makefile.am @@ -32,12 +32,12 @@ noinst_LTLIBRARIES = libconstants.la # The convenience library depends on its source. libconstants_la_SOURCES = \ fmsconstants.F90 \ - gfdl_constants.h \ - gfs_constants.h \ - geos_constants.h \ + gfdl_constants.fh \ + gfs_constants.fh \ + geos_constants.fh \ constants.F90 -FMSconstants.$(FC_MODEXT): gfdl_constants.h gfs_constants.h geos_constants.h +FMSconstants.$(FC_MODEXT): gfdl_constants.fh gfs_constants.fh geos_constants.fh constants_mod.$(FC_MODEXT): fmsconstants.$(FC_MODEXT) # Mod files are built and then installed as headers diff --git a/constants/fmsconstants.F90 b/constants/fmsconstants.F90 index 3abc5da70a..6734f88166 100644 --- a/constants/fmsconstants.F90 +++ b/constants/fmsconstants.F90 @@ -28,9 +28,9 @@ !! statement.

!! !! The currently support contant systems are: -!! GFDL constants (gfdl_constants.h) -!! GEOS constants (geos_constants.h) -!! GFS constants (gfs_constants.h) +!! GFDL constants (gfdl_constants.fh) +!! GEOS constants (geos_constants.fh) +!! GFS constants (gfs_constants.fh) !!

!! !! The name given to a particular constant may be changed.

@@ -71,13 +71,13 @@ module FMSconstants !--- perform error checking and include the correct system of constants #if defined(GFDL_CONSTANTS) && !defined(GFS_CONSTANTS) && !defined(GEOS_CONSTANTS) #warning "Using GFDL constants" -#include +#include #elif !defined(GFDL_CONSTANTS) && defined(GFS_CONSTANTS) && !defined(GEOS_CONSTANTS) #warning "Using GFS constants" -#include +#include #elif !defined(GFDL_CONSTANTS) && !defined(GFS_CONSTANTS) && defined(GEOS_CONSTANTS) #warning "Using GEOS constants" -#include +#include #else #error FATAL FMSConstants error - multiple constants macros are defined for FMS #endif diff --git a/constants/geos_constants.h b/constants/geos_constants.fh similarity index 73% rename from constants/geos_constants.h rename to constants/geos_constants.fh index edc298b41e..ce2939985e 100644 --- a/constants/geos_constants.h +++ b/constants/geos_constants.fh @@ -23,11 +23,14 @@ character(len=18), public, parameter :: constants_version = 'FMSConstants: GEOS' real(kind=RKIND), public, parameter :: small_fac = 1._r8_kind !--- Spherical coordinate conversion constants -real(kind=r8_kind), public, parameter :: PI_8 = 3.14159265358979323846_r8_kind !< Ratio of circle circumference to diameter [N/A] -real(kind=RKIND), public, parameter :: PI = PI_8 !< Ratio of circle circumference to diameter [N/A] +real(kind=r8_kind), public, parameter :: PI_8 = 3.14159265358979323846_r8_kind !< Ratio of circle circumference + !! to diameter [N/A] +real(kind=RKIND), public, parameter :: PI = PI_8 !< Ratio of circle circumference + !! to diameter [N/A] real(kind=RKIND), public, parameter :: RAD_TO_DEG = 180._r8_kind/PI_8 !< Degrees per radian [deg/rad] real(kind=RKIND), public, parameter :: DEG_TO_RAD = PI_8/180._r8_kind !< Radians per degree [rad/deg] -real(kind=RKIND), public, parameter :: RADIAN = RAD_TO_DEG !< Equal to RAD_TO_DEG for backward compatability. [rad/deg] +real(kind=RKIND), public, parameter :: RADIAN = RAD_TO_DEG !< Equal to RAD_TO_DEG for backward + !!compatability. [rad/deg] !--- Earth physical constants real(kind=RKIND), public, parameter :: RADIUS = 6371.0E3_r8_kind !< Radius of the Earth [m] @@ -39,7 +42,8 @@ real(kind=RKIND), public, parameter :: SECONDS_PER_MINUTE = 60._r8_kind ! !--- Various gas constants real(kind=RKIND), public, parameter :: RDGAS = 8314.47 /28.965 !< Gas constant for dry air [J/kg/deg] -real(kind=RKIND), public, parameter :: RVGAS = 8314.47 /18.015 !< Gas constant for water vapor [J/kg/deg] +real(kind=RKIND), public, parameter :: RVGAS = 8314.47 /18.015 !< Gas constant for water vapor + !! [J/kg/deg] real(kind=RKIND), public, parameter :: HLV = 2.4665E6_r8_kind !< Latent heat of evaporation [J/kg] real(kind=RKIND), public, parameter :: HLF = 3.3370E5_r8_kind !< Latent heat of fusion [J/kg] real(kind=RKIND), public, parameter :: HLS = HLV + HLF !< Latent heat of sublimation [J/kg] @@ -48,30 +52,38 @@ real(kind=RKIND), public, parameter :: CP_AIR = RDGAS/KAPPA !< S !! at constant pressure [J/kg/deg] real(kind=RKIND), public, parameter :: CP_VAPOR = 4.0_r8_kind*RVGAS !< Specific heat capacity of water vapor !! at constant pressure [J/kg/deg] -real(kind=RKIND), public, parameter :: CP_OCEAN = 3989.24495292815_r8_kind !< Specific heat capacity taken from McDougall (2002) +real(kind=RKIND), public, parameter :: CP_OCEAN = 3989.24495292815_r8_kind !< Specific heat capacity taken + !! from McDougall (2002) !! "Potential Enthalpy ..." [J/kg/deg] real(kind=RKIND), public, parameter :: DENS_H2O = 1000._r8_kind !< Density of liquid water [kg/m^3] real(kind=RKIND), public, parameter :: RHOAIR = 1.292269_r8_kind !< Reference atmospheric density [kg/m^3] real(kind=RKIND), public, parameter :: RHO0 = 1.035E3_r8_kind !< Average density of sea water [kg/m^3] -real(kind=RKIND), public, parameter :: RHO0R = 1.0_r8_kind/RHO0 !< Reciprocal of average density of sea water [m^3/kg] +real(kind=RKIND), public, parameter :: RHO0R = 1.0_r8_kind/RHO0 !< Reciprocal of average density + !! of sea water [m^3/kg] real(kind=RKIND), public, parameter :: RHO_CP = RHO0*CP_OCEAN !< (kg/m^3)*(cal/kg/deg C)(joules/cal) = !! (joules/m^3/deg C) [J/m^3/deg] -real(kind=RKIND), public, parameter :: O2MIXRAT = 2.0953E-01_r8_kind !< Mixing ratio of molecular oxygen in air [dimensionless] +real(kind=RKIND), public, parameter :: O2MIXRAT = 2.0953E-01_r8_kind !< Mixing ratio of molecular oxygen + !! in air [dimensionless] real(kind=RKIND), public, parameter :: WTMAIR = 2.896440E+01_r8_kind !< Molecular weight of air [AMU] real(kind=RKIND), public, parameter :: WTMH2O = WTMAIR*(RDGAS/RVGAS) !< Molecular weight of water [AMU] real(kind=RKIND), public, parameter :: WTMOZONE = 47.99820_r8_kind !< Molecular weight of ozone [AMU] real(kind=RKIND), public, parameter :: WTMC = 12.00000_r8_kind !< Molecular weight of carbon [AMU] -real(kind=RKIND), public, parameter :: WTMCO2 = 44.00995_r8_kind !< Molecular weight of carbon dioxide [AMU] +real(kind=RKIND), public, parameter :: WTMCO2 = 44.00995_r8_kind !< Molecular weight of carbon dioxide + !! [AMU] real(kind=RKIND), public, parameter :: WTMCH4 = 16.0425_r8_kind !< Molecular weight of methane [AMU] -real(kind=RKIND), public, parameter :: WTMO2 = 31.9988_r8_kind !< Molecular weight of molecular oxygen [AMU] -real(kind=RKIND), public, parameter :: WTMCFC11 = 137.3681_r8_kind !< Molecular weight of CFC-11 (CCl3F) [AMU] -real(kind=RKIND), public, parameter :: WTMCFC12 = 120.9135_r8_kind !< Molecular weight of CFC-21 (CCl2F2) [AMU] +real(kind=RKIND), public, parameter :: WTMO2 = 31.9988_r8_kind !< Molecular weight of molecular oxygen + !! [AMU] +real(kind=RKIND), public, parameter :: WTMCFC11 = 137.3681_r8_kind !< Molecular weight of CFC-11 + !! (CCl3F) [AMU] +real(kind=RKIND), public, parameter :: WTMCFC12 = 120.9135_r8_kind !< Molecular weight of CFC-21 + !! (CCl2F2) [AMU] real(kind=RKIND), public, parameter :: WTMN = 14.0067_r8_kind !< Molecular weight of Nitrogen [AMU] real(kind=RKIND), public, parameter :: DIFFAC = 1.660_r8_kind !< Diffusivity factor [dimensionless] real(kind=RKIND), public, parameter :: ES0 = 1.0_r8_kind !< Humidity factor [dimensionless] - !! Controls the humidity content of the atmosphere through - !! the Saturation Vapour Pressure expression - !! when using DO_SIMPLE + !! Controls the humidity content of + !! the atmosphere through + !! the Saturation Vapour Pressure + !! expression when using DO_SIMPLE !--- Pressure and Temperature constants real(kind=RKIND), public, parameter :: PSTD = 1.013250E+06_r8_kind !< Mean sea level pressure [dynes/cm^2] @@ -87,11 +99,15 @@ real(kind=RKIND), public, parameter :: AVOGNO = 6.023000E+23_r8_kind !< A real(kind=RKIND), public, parameter :: VONKARM = 0.40_r8_kind !< Von Karman constant [dimensionless] !--- Miscellaneous constants -real(kind=RKIND), public, parameter :: ALOGMIN = -50.0_r8_kind !< Minimum value allowed as argument to log function [N/A] -real(kind=RKIND), public, parameter :: EPSLN = 1.0E-40_r8_kind !< A small number to prevent divide by zero exceptions [N/A] -real(kind=RKIND), public, parameter :: RADCON = ((1.0E+02*GRAV)/(1.0D+04*CP_AIR))*SECONDS_PER_DAY !< Factor to convert flux divergence - !! to heating rate in degrees per day - !! [deg sec/(cm day)] -real(kind=RKIND), public, parameter :: RADCON_MKS = (GRAV/CP_AIR)*SECONDS_PER_DAY !< Factor to convert flux divergence - !! to heating rate in degrees per day - !! [deg sec/(m day)] +real(kind=RKIND), public, parameter :: ALOGMIN = -50.0_r8_kind !< Minimum value allowed as argument + !! to log function [N/A] +real(kind=RKIND), public, parameter :: EPSLN = 1.0E-40_r8_kind !< A small number to prevent divide + !! by zero exceptions [N/A] +real(kind=RKIND), public, parameter :: RADCON = ((1.0E+02*GRAV)/(1.0D+04*CP_AIR))*SECONDS_PER_DAY !< Factor to + !! convert flux divergence + !! to heating rate in degrees per day + !! [deg sec/(cm day)] +real(kind=RKIND), public, parameter :: RADCON_MKS = (GRAV/CP_AIR)*SECONDS_PER_DAY !< Factor to + !! convert flux divergence + !! to heating rate in degrees per day + !! [deg sec/(m day)] diff --git a/constants/gfdl_constants.h b/constants/gfdl_constants.fh similarity index 73% rename from constants/gfdl_constants.h rename to constants/gfdl_constants.fh index 9e0b8812a1..333cf44051 100644 --- a/constants/gfdl_constants.h +++ b/constants/gfdl_constants.fh @@ -23,11 +23,14 @@ character(len=18), public, parameter :: constants_version = 'FMSConstants: GFDL' real(kind=RKIND), public, parameter :: small_fac = 1._r8_kind !--- Spherical coordinate conversion constants -real(kind=r8_kind), public, parameter :: PI_8 = 3.14159265358979323846_r8_kind !< Ratio of circle circumference to diameter [N/A] -real(kind=RKIND), public, parameter :: PI = PI_8 !< Ratio of circle circumference to diameter [N/A] +real(kind=r8_kind), public, parameter :: PI_8 = 3.14159265358979323846_r8_kind !< Ratio of circle circumference to + !! diameter [N/A] +real(kind=RKIND), public, parameter :: PI = PI_8 !< Ratio of circle circumference to + !! diameter [N/A] real(kind=RKIND), public, parameter :: RAD_TO_DEG = 180._r8_kind/PI_8 !< Degrees per radian [deg/rad] real(kind=RKIND), public, parameter :: DEG_TO_RAD = PI_8/180._r8_kind !< Radians per degree [rad/deg] -real(kind=RKIND), public, parameter :: RADIAN = RAD_TO_DEG !< Equal to RAD_TO_DEG for backward compatability. [rad/deg] +real(kind=RKIND), public, parameter :: RADIAN = RAD_TO_DEG !< Equal to RAD_TO_DEG for backward + !! compatability. [rad/deg] !--- Earth physical constants real(kind=RKIND), public, parameter :: RADIUS = 6371.0E+3_r8_kind !< Radius of the Earth [m] @@ -39,7 +42,8 @@ real(kind=RKIND), public, parameter :: SECONDS_PER_MINUTE = 60._r8_kind ! !--- Various gas constants real(kind=RKIND), public, parameter :: RDGAS = 287.04_r8_kind !< Gas constant for dry air [J/kg/deg] -real(kind=RKIND), public, parameter :: RVGAS = 461.50_r8_kind !< Gas constant for water vapor [J/kg/deg] +real(kind=RKIND), public, parameter :: RVGAS = 461.50_r8_kind !< Gas constant for water vapor + !! [J/kg/deg] real(kind=RKIND), public, parameter :: HLV = 2.500E6_r8_kind !< Latent heat of evaporation [J/kg] real(kind=RKIND), public, parameter :: HLF = 3.34E5_r8_kind !< Latent heat of fusion [J/kg] real(kind=RKIND), public, parameter :: HLS = HLV + HLF !< Latent heat of sublimation [J/kg] @@ -48,30 +52,38 @@ real(kind=RKIND), public, parameter :: CP_AIR = RDGAS/KAPPA !< S !! at constant pressure [J/kg/deg] real(kind=RKIND), public, parameter :: CP_VAPOR = 4.0_r8_kind*RVGAS !< Specific heat capacity of water vapor !! at constant pressure [J/kg/deg] -real(kind=RKIND), public, parameter :: CP_OCEAN = 3989.24495292815_r8_kind !< Specific heat capacity taken from McDougall (2002) +real(kind=RKIND), public, parameter :: CP_OCEAN = 3989.24495292815_r8_kind !< Specific heat capacity taken + !! from McDougall (2002) !! "Potential Enthalpy ..." [J/kg/deg] real(kind=RKIND), public, parameter :: DENS_H2O = 1000._r8_kind !< Density of liquid water [kg/m^3] real(kind=RKIND), public, parameter :: RHOAIR = 1.292269_r8_kind !< Reference atmospheric density [kg/m^3] real(kind=RKIND), public, parameter :: RHO0 = 1.035E3_r8_kind !< Average density of sea water [kg/m^3] -real(kind=RKIND), public, parameter :: RHO0R = 1.0_r8_kind/RHO0 !< Reciprocal of average density of sea water [m^3/kg] +real(kind=RKIND), public, parameter :: RHO0R = 1.0_r8_kind/RHO0 !< Reciprocal of average density of + !! sea water [m^3/kg] real(kind=RKIND), public, parameter :: RHO_CP = RHO0*CP_OCEAN !< (kg/m^3)*(cal/kg/deg C)(joules/cal) = !! (joules/m^3/deg C) [J/m^3/deg] -real(kind=RKIND), public, parameter :: O2MIXRAT = 2.0953E-01_r8_kind !< Mixing ratio of molecular oxygen in air [dimensionless] +real(kind=RKIND), public, parameter :: O2MIXRAT = 2.0953E-01_r8_kind !< Mixing ratio of molecular oxygen + !! in air [dimensionless] real(kind=RKIND), public, parameter :: WTMAIR = 2.896440E+01_r8_kind !< Molecular weight of air [AMU] real(kind=RKIND), public, parameter :: WTMH2O = WTMAIR*(RDGAS/RVGAS) !< Molecular weight of water [AMU] real(kind=RKIND), public, parameter :: WTMOZONE = 47.99820_r8_kind !< Molecular weight of ozone [AMU] real(kind=RKIND), public, parameter :: WTMC = 12.00000_r8_kind !< Molecular weight of carbon [AMU] -real(kind=RKIND), public, parameter :: WTMCO2 = 44.00995_r8_kind !< Molecular weight of carbon dioxide [AMU] +real(kind=RKIND), public, parameter :: WTMCO2 = 44.00995_r8_kind !< Molecular weight of carbon dioxide + !! [AMU] real(kind=RKIND), public, parameter :: WTMCH4 = 16.0425_r8_kind !< Molecular weight of methane [AMU] -real(kind=RKIND), public, parameter :: WTMO2 = 31.9988_r8_kind !< Molecular weight of molecular oxygen [AMU] -real(kind=RKIND), public, parameter :: WTMCFC11 = 137.3681_r8_kind !< Molecular weight of CFC-11 (CCl3F) [AMU] -real(kind=RKIND), public, parameter :: WTMCFC12 = 120.9135_r8_kind !< Molecular weight of CFC-21 (CCl2F2) [AMU] +real(kind=RKIND), public, parameter :: WTMO2 = 31.9988_r8_kind !< Molecular weight of molecular + !! oxygen [AMU] +real(kind=RKIND), public, parameter :: WTMCFC11 = 137.3681_r8_kind !< Molecular weight of CFC-11 + !! (CCl3F) [AMU] +real(kind=RKIND), public, parameter :: WTMCFC12 = 120.9135_r8_kind !< Molecular weight of CFC-21 + !! (CCl2F2) [AMU] real(kind=RKIND), public, parameter :: WTMN = 14.0067_r8_kind !< Molecular weight of Nitrogen [AMU] real(kind=RKIND), public, parameter :: DIFFAC = 1.660_r8_kind !< Diffusivity factor [dimensionless] real(kind=RKIND), public, parameter :: ES0 = 1.0_r8_kind !< Humidity factor [dimensionless] - !! Controls the humidity content of the atmosphere through - !! the Saturation Vapour Pressure expression - !! when using DO_SIMPLE + !! Controls the humidity content of + !! the atmosphere through + !! the Saturation Vapour Pressure + !! expression when using DO_SIMPLE !--- Pressure and Temperature constants real(kind=RKIND), public, parameter :: PSTD = 1.013250E+06_r8_kind !< Mean sea level pressure [dynes/cm^2] @@ -87,11 +99,15 @@ real(kind=RKIND), public, parameter :: AVOGNO = 6.023000E+23_r8_kind !< A real(kind=RKIND), public, parameter :: VONKARM = 0.40_r8_kind !< Von Karman constant [dimensionless] !--- Miscellaneous constants -real(kind=RKIND), public, parameter :: ALOGMIN = -50.0_r8_kind !< Minimum value allowed as argument to log function [N/A] -real(kind=RKIND), public, parameter :: EPSLN = 1.0E-40_r8_kind !< A small number to prevent divide by zero exceptions [N/A] -real(kind=RKIND), public, parameter :: RADCON = ((1.0E+02*GRAV)/(1.0D+04*CP_AIR))*SECONDS_PER_DAY !< Factor to convert flux divergence - !! to heating rate in degrees per day - !! [deg sec/(cm day)] -real(kind=RKIND), public, parameter :: RADCON_MKS = (GRAV/CP_AIR)*SECONDS_PER_DAY !< Factor to convert flux divergence - !! to heating rate in degrees per day - !! [deg sec/(m day)] +real(kind=RKIND), public, parameter :: ALOGMIN = -50.0_r8_kind !< Minimum value allowed as argument + !! to log function [N/A] +real(kind=RKIND), public, parameter :: EPSLN = 1.0E-40_r8_kind !< A small number to prevent + !! divide by zero exceptions [N/A] +real(kind=RKIND), public, parameter :: RADCON = ((1.0E+02*GRAV)/(1.0D+04*CP_AIR))*SECONDS_PER_DAY !< Factor to + !! convert flux divergence + !! to heating rate in degrees per day + !! [deg sec/(cm day)] +real(kind=RKIND), public, parameter :: RADCON_MKS = (GRAV/CP_AIR)*SECONDS_PER_DAY !< Factor to + !! convert flux divergence + !! to heating rate in degrees per day + !! [deg sec/(m day)] diff --git a/constants/gfs_constants.h b/constants/gfs_constants.fh similarity index 73% rename from constants/gfs_constants.h rename to constants/gfs_constants.fh index b732f6d43a..d5eb711739 100644 --- a/constants/gfs_constants.h +++ b/constants/gfs_constants.fh @@ -23,17 +23,22 @@ character(len=18), public, parameter :: constants_version = 'FMSConstants: GFS ' real(kind=RKIND), public, parameter :: small_fac = 1._r8_kind !--- Spherical coordinate conversion constants -real(kind=r8_kind), public, parameter :: PI_8 = 3.1415926535897931_r8_kind !< Ratio of circle circumference to diameter [N/A] -real(kind=RKIND), public, parameter :: PI = PI_8 !< Ratio of circle circumference to diameter [N/A] +real(kind=r8_kind), public, parameter :: PI_8 = 3.1415926535897931_r8_kind !< Ratio of circle circumference + !! to diameter [N/A] +real(kind=RKIND), public, parameter :: PI = PI_8 !< Ratio of circle circumference + !! to diameter [N/A] real(kind=RKIND), public, parameter :: RAD_TO_DEG = 180._r8_kind/PI_8 !< Degrees per radian [deg/rad] real(kind=RKIND), public, parameter :: DEG_TO_RAD = PI_8/180._r8_kind !< Radians per degree [rad/deg] -real(kind=RKIND), public, parameter :: RADIAN = RAD_TO_DEG !< Equal to RAD_TO_DEG for backward compatability. [rad/deg] +real(kind=RKIND), public, parameter :: RADIAN = RAD_TO_DEG !< Equal to RAD_TO_DEG for backward + !! compatability. [rad/deg] !--- Earth physical constants real(kind=RKIND), public, parameter :: RADIUS = 6.3712E+6_r8_kind !< Radius of the Earth [m] real(kind=RKIND), public, parameter :: OMEGA = 7.2921E-5_r8_kind !< Rotation rate of the Earth [1/s] -real(kind=r8_kind), public, parameter :: GRAV_8 = 9.80665_r8_kind !< Acceleration due to gravity [m/s^2] (REAL(KIND=8)) -real(kind=RKIND), public, parameter :: GRAV = GRAV_8 !< Acceleration due to gravity [m/s^2] +real(kind=r8_kind), public, parameter :: GRAV_8 = 9.80665_r8_kind !< Acceleration due to gravity + !! [m/s^2] (REAL(KIND=8)) +real(kind=RKIND), public, parameter :: GRAV = GRAV_8 !< Acceleration due to gravity + !! [m/s^2] real(kind=RKIND), public, parameter :: SECONDS_PER_DAY = 86400._r8_kind !< Seconds in a day [s] real(kind=RKIND), public, parameter :: SECONDS_PER_HOUR = 3600._r8_kind !< Seconds in an hour [s] real(kind=RKIND), public, parameter :: SECONDS_PER_MINUTE = 60._r8_kind !< Seconds in a minute [s] @@ -48,31 +53,39 @@ real(kind=RKIND), public, parameter :: CP_AIR = 1004.6_r8_kind !< S !! at constant pressure [J/kg/deg] real(kind=RKIND), public, parameter :: CP_VAPOR = 4.0_r8_kind*RVGAS !< Specific heat capacity of water vapor !! at constant pressure [J/kg/deg] -real(kind=RKIND), public, parameter :: CP_OCEAN = 3989.24495292815_r8_kind !< Specific heat capacity taken from McDougall (2002) +real(kind=RKIND), public, parameter :: CP_OCEAN = 3989.24495292815_r8_kind !< Specific heat capacity taken + !! from McDougall (2002) !! "Potential Enthalpy ..." [J/kg/deg] real(kind=RKIND), public, parameter :: KAPPA = RDGAS/CP_AIR !< RDGAS / CP_AIR [dimensionless] real(kind=RKIND), public, parameter :: DENS_H2O = 1000._r8_kind !< Density of liquid water [kg/m^3] real(kind=RKIND), public, parameter :: RHOAIR = 1.292269_r8_kind !< Reference atmospheric density [kg/m^3] real(kind=RKIND), public, parameter :: RHO0 = 1.035E3_r8_kind !< Average density of sea water [kg/m^3] -real(kind=RKIND), public, parameter :: RHO0R = 1.0_r8_kind/RHO0 !< Reciprocal of average density of sea water [m^3/kg] +real(kind=RKIND), public, parameter :: RHO0R = 1.0_r8_kind/RHO0 !< Reciprocal of average density of + !! sea water [m^3/kg] real(kind=RKIND), public, parameter :: RHO_CP = RHO0*CP_OCEAN !< (kg/m^3)*(cal/kg/deg C)(joules/cal) = !! (joules/m^3/deg C) [J/m^3/deg] -real(kind=RKIND), public, parameter :: O2MIXRAT = 2.0953E-01_r8_kind !< Mixing ratio of molecular oxygen in air [dimensionless] +real(kind=RKIND), public, parameter :: O2MIXRAT = 2.0953E-01_r8_kind !< Mixing ratio of molecular oxygen + !! in air [dimensionless] real(kind=RKIND), public, parameter :: WTMAIR = 2.896440E+01_r8_kind !< Molecular weight of air [AMU] real(kind=RKIND), public, parameter :: WTMH2O = WTMAIR*(RDGAS/RVGAS) !< Molecular weight of water [AMU] real(kind=RKIND), public, parameter :: WTMOZONE = 47.99820_r8_kind !< Molecular weight of ozone [AMU] real(kind=RKIND), public, parameter :: WTMC = 12.00000_r8_kind !< Molecular weight of carbon [AMU] -real(kind=RKIND), public, parameter :: WTMCO2 = 44.00995_r8_kind !< Molecular weight of carbon dioxide [AMU] +real(kind=RKIND), public, parameter :: WTMCO2 = 44.00995_r8_kind !< Molecular weight of carbon dioxide + !! [AMU] real(kind=RKIND), public, parameter :: WTMCH4 = 16.0425_r8_kind !< Molecular weight of methane [AMU] -real(kind=RKIND), public, parameter :: WTMO2 = 31.9988_r8_kind !< Molecular weight of molecular oxygen [AMU] -real(kind=RKIND), public, parameter :: WTMCFC11 = 137.3681_r8_kind !< Molecular weight of CFC-11 (CCl3F) [AMU] -real(kind=RKIND), public, parameter :: WTMCFC12 = 120.9135_r8_kind !< Molecular weight of CFC-21 (CCl2F2) [AMU] +real(kind=RKIND), public, parameter :: WTMO2 = 31.9988_r8_kind !< Molecular weight of molecular + !! oxygen [AMU] +real(kind=RKIND), public, parameter :: WTMCFC11 = 137.3681_r8_kind !< Molecular weight of CFC-11 + !! (CCl3F) [AMU] +real(kind=RKIND), public, parameter :: WTMCFC12 = 120.9135_r8_kind !< Molecular weight of CFC-21 + !! (CCl2F2) [AMU] real(kind=RKIND), public, parameter :: WTMN = 14.0067_r8_kind !< Molecular weight of Nitrogen [AMU] real(kind=RKIND), public, parameter :: DIFFAC = 1.660_r8_kind !< Diffusivity factor [dimensionless] real(kind=RKIND), public, parameter :: ES0 = 1.0_r8_kind !< Humidity factor [dimensionless] - !! Controls the humidity content of the atmosphere through - !! the Saturation Vapour Pressure expression - !! when using DO_SIMPLE + !! Controls the humidity content of + !! the atmosphere through + !! the Saturation Vapour Pressure + !! expression when using DO_SIMPLE real(kind=RKIND), public, parameter :: CON_CLIQ = 4.1855E+3_r8_kind !< Specific heat H2O liq [J/kg/K] real(kind=RKIND), public, parameter :: CON_CSOL = 2.1060E+3_r8_kind !< Specific heat H2O ice [J/kg/K] @@ -90,11 +103,15 @@ real(kind=RKIND), public, parameter :: AVOGNO = 6.023000E+23_r8_kind !< A real(kind=RKIND), public, parameter :: VONKARM = 0.40_r8_kind !< Von Karman constant [dimensionless] !--- Miscellaneous constants -real(kind=RKIND), public, parameter :: ALOGMIN = -50.0_r8_kind !< Minimum value allowed as argument to log function [N/A] -real(kind=RKIND), public, parameter :: EPSLN = 1.0E-40_r8_kind !< A small number to prevent divide by zero exceptions [N/A] -real(kind=RKIND), public, parameter :: RADCON = ((1.0D+02*GRAV)/(1.0D+04*CP_AIR))*SECONDS_PER_DAY !< Factor to convert flux divergence - !! to heating rate in degrees per day - !! [deg sec/(cm day)] -real(kind=RKIND), public, parameter :: RADCON_MKS = (GRAV/CP_AIR)*SECONDS_PER_DAY !< Factor to convert flux divergence - !! to heating rate in degrees per day - !! [deg sec/(m day)] +real(kind=RKIND), public, parameter :: ALOGMIN = -50.0_r8_kind !< Minimum value allowed as argument + !! to log function [N/A] +real(kind=RKIND), public, parameter :: EPSLN = 1.0E-40_r8_kind !< A small number to prevent divide by + !! zero exceptions [N/A] +real(kind=RKIND), public, parameter :: RADCON = ((1.0D+02*GRAV)/(1.0D+04*CP_AIR))*SECONDS_PER_DAY !< Factor to + !! convert flux divergence + !! to heating rate in degrees per day + !! [deg sec/(cm day)] +real(kind=RKIND), public, parameter :: RADCON_MKS = (GRAV/CP_AIR)*SECONDS_PER_DAY !< Factor to + !! convert flux divergence + !! to heating rate in degrees per day + !! [deg sec/(m day)] diff --git a/constants4/Makefile.am b/constants4/Makefile.am index 73a4726675..9bba1fddf1 100644 --- a/constants4/Makefile.am +++ b/constants4/Makefile.am @@ -32,12 +32,12 @@ noinst_LTLIBRARIES = libconstants4.la # The convenience library depends on its source. libconstants4_la_SOURCES = \ fmsconstantsr4.F90 \ - gfdl_constantsR4.h \ - gfs_constantsR4.h \ - geos_constantsR4.h \ + gfdl_constantsR4.fh \ + gfs_constantsR4.fh \ + geos_constantsR4.fh \ constantsr4.F90 -fmsconstantsr4.$(FC_MODEXT): gfdl_constantsR4.h gfs_constantsR4.h geos_constantsR4.h +fmsconstantsr4.$(FC_MODEXT): gfdl_constantsR4.fh gfs_constantsR4.fh geos_constantsR4.fh constantsr4_mod.$(FC_MODEXT): fmsconstantsr4.$(FC_MODEXT) # Mod files are built and then installed as headers diff --git a/constants4/fmsconstantsr4.F90 b/constants4/fmsconstantsr4.F90 index 76267101d6..fd80cc062e 100644 --- a/constants4/fmsconstantsr4.F90 +++ b/constants4/fmsconstantsr4.F90 @@ -28,9 +28,9 @@ !! statement.

!! !! The currently support contant systems are: -!! GFDL constants (gfdl_constantsR4.h) -!! GEOS constants (geos_constantsR4.h) -!! GFS constants (gfs_constantsR4.h) +!! GFDL constants (gfdl_constantsR4.fh) +!! GEOS constants (geos_constantsR4.fh) +!! GFS constants (gfs_constantsR4.fh) !!

!! !! The name given to a particular constant may be changed.

@@ -68,13 +68,13 @@ module FMSconstantsR4 !--- perform error checking and include the correct system of constants #if defined(GFDL_CONSTANTS) && !defined(GFS_CONSTANTS) && !defined(GEOS_CONSTANTS) #warning "Using GFDL constantsR4" -#include +#include #elif !defined(GFDL_CONSTANTS) && defined(GFS_CONSTANTS) && !defined(GEOS_CONSTANTS) #warning "Using GFS constantsR4" -#include +#include #elif !defined(GFDL_CONSTANTS) && !defined(GFS_CONSTANTS) && defined(GEOS_CONSTANTS) #warning "Using GEOS constantsR4" -#include +#include #else #error FATAL FMSConstantsR4 error - multiple constants macros are defined for FMS #endif diff --git a/constants4/geos_constantsR4.h b/constants4/geos_constantsR4.fh similarity index 73% rename from constants4/geos_constantsR4.h rename to constants4/geos_constantsR4.fh index a2b719b29e..d2840e5a6b 100644 --- a/constants4/geos_constantsR4.h +++ b/constants4/geos_constantsR4.fh @@ -23,11 +23,14 @@ character(len=20), public, parameter :: constantsR4_version = 'FMSConstantsR4: G real(kind=RKIND), public, parameter :: small_fac = 1._r8_kind !--- Spherical coordinate conversion constants -real(kind=r8_kind), public, parameter :: PI_8 = 3.14159265358979323846_r8_kind !< Ratio of circle circumference to diameter [N/A] -real(kind=RKIND), public, parameter :: PI = PI_8 !< Ratio of circle circumference to diameter [N/A] +real(kind=r8_kind), public, parameter :: PI_8 = 3.14159265358979323846_r8_kind !< Ratio of circle circumference + !! to diameter [N/A] +real(kind=RKIND), public, parameter :: PI = PI_8 !< Ratio of circle circumference + !! to diameter [N/A] real(kind=RKIND), public, parameter :: RAD_TO_DEG = 180._r8_kind/PI_8 !< Degrees per radian [deg/rad] real(kind=RKIND), public, parameter :: DEG_TO_RAD = PI_8/180._r8_kind !< Radians per degree [rad/deg] -real(kind=RKIND), public, parameter :: RADIAN = RAD_TO_DEG !< Equal to RAD_TO_DEG for backward compatability. [rad/deg] +real(kind=RKIND), public, parameter :: RADIAN = RAD_TO_DEG !< Equal to RAD_TO_DEG for backward + !! compatability.[rad/deg] !--- Earth physical constants real(kind=RKIND), public, parameter :: RADIUS = 6371.0E3_r8_kind !< Radius of the Earth [m] @@ -39,7 +42,8 @@ real(kind=RKIND), public, parameter :: SECONDS_PER_MINUTE = 60._r8_kind ! !--- Various gas constants real(kind=RKIND), public, parameter :: RDGAS = 8314.47 /28.965 !< Gas constant for dry air [J/kg/deg] -real(kind=RKIND), public, parameter :: RVGAS = 8314.47 /18.015 !< Gas constant for water vapor [J/kg/deg] +real(kind=RKIND), public, parameter :: RVGAS = 8314.47 /18.015 !< Gas constant for water vapor + !! [J/kg/deg] real(kind=RKIND), public, parameter :: HLV = 2.4665E6_r8_kind !< Latent heat of evaporation [J/kg] real(kind=RKIND), public, parameter :: HLF = 3.3370E5_r8_kind !< Latent heat of fusion [J/kg] real(kind=RKIND), public, parameter :: HLS = HLV + HLF !< Latent heat of sublimation [J/kg] @@ -48,30 +52,38 @@ real(kind=RKIND), public, parameter :: CP_AIR = RDGAS/KAPPA !< S !! at constant pressure [J/kg/deg] real(kind=RKIND), public, parameter :: CP_VAPOR = 4.0_r8_kind*RVGAS !< Specific heat capacity of water vapor !! at constant pressure [J/kg/deg] -real(kind=RKIND), public, parameter :: CP_OCEAN = 3989.24495292815_r8_kind !< Specific heat capacity taken from McDougall (2002) +real(kind=RKIND), public, parameter :: CP_OCEAN = 3989.24495292815_r8_kind !< Specific heat capacity taken + !! from McDougall (2002) !! "Potential Enthalpy ..." [J/kg/deg] real(kind=RKIND), public, parameter :: DENS_H2O = 1000._r8_kind !< Density of liquid water [kg/m^3] real(kind=RKIND), public, parameter :: RHOAIR = 1.292269_r8_kind !< Reference atmospheric density [kg/m^3] real(kind=RKIND), public, parameter :: RHO0 = 1.035E3_r8_kind !< Average density of sea water [kg/m^3] -real(kind=RKIND), public, parameter :: RHO0R = 1.0_r8_kind/RHO0 !< Reciprocal of average density of sea water [m^3/kg] +real(kind=RKIND), public, parameter :: RHO0R = 1.0_r8_kind/RHO0 !< Reciprocal of average density of sea + !! water [m^3/kg] real(kind=RKIND), public, parameter :: RHO_CP = RHO0*CP_OCEAN !< (kg/m^3)*(cal/kg/deg C)(joules/cal) = !! (joules/m^3/deg C) [J/m^3/deg] -real(kind=RKIND), public, parameter :: O2MIXRAT = 2.0953E-01_r8_kind !< Mixing ratio of molecular oxygen in air [dimensionless] +real(kind=RKIND), public, parameter :: O2MIXRAT = 2.0953E-01_r8_kind !< Mixing ratio of molecular oxygen + !! in air [dimensionless] real(kind=RKIND), public, parameter :: WTMAIR = 2.896440E+01_r8_kind !< Molecular weight of air [AMU] real(kind=RKIND), public, parameter :: WTMH2O = WTMAIR*(RDGAS/RVGAS) !< Molecular weight of water [AMU] real(kind=RKIND), public, parameter :: WTMOZONE = 47.99820_r8_kind !< Molecular weight of ozone [AMU] real(kind=RKIND), public, parameter :: WTMC = 12.00000_r8_kind !< Molecular weight of carbon [AMU] -real(kind=RKIND), public, parameter :: WTMCO2 = 44.00995_r8_kind !< Molecular weight of carbon dioxide [AMU] +real(kind=RKIND), public, parameter :: WTMCO2 = 44.00995_r8_kind !< Molecular weight of carbon dioxide + !! [AMU] real(kind=RKIND), public, parameter :: WTMCH4 = 16.0425_r8_kind !< Molecular weight of methane [AMU] -real(kind=RKIND), public, parameter :: WTMO2 = 31.9988_r8_kind !< Molecular weight of molecular oxygen [AMU] -real(kind=RKIND), public, parameter :: WTMCFC11 = 137.3681_r8_kind !< Molecular weight of CFC-11 (CCl3F) [AMU] -real(kind=RKIND), public, parameter :: WTMCFC12 = 120.9135_r8_kind !< Molecular weight of CFC-21 (CCl2F2) [AMU] +real(kind=RKIND), public, parameter :: WTMO2 = 31.9988_r8_kind !< Molecular weight of molecular oxygen + !! [AMU] +real(kind=RKIND), public, parameter :: WTMCFC11 = 137.3681_r8_kind !< Molecular weight of CFC-11 (CCl3F) + !! [AMU] +real(kind=RKIND), public, parameter :: WTMCFC12 = 120.9135_r8_kind !< Molecular weight of CFC-21 (CCl2F2) + !! [AMU] real(kind=RKIND), public, parameter :: WTMN = 14.0067_r8_kind !< Molecular weight of Nitrogen [AMU] real(kind=RKIND), public, parameter :: DIFFAC = 1.660_r8_kind !< Diffusivity factor [dimensionless] real(kind=RKIND), public, parameter :: ES0 = 1.0_r8_kind !< Humidity factor [dimensionless] - !! Controls the humidity content of the atmosphere through - !! the Saturation Vapour Pressure expression - !! when using DO_SIMPLE + !! Controls the humidity content of + !! the atmosphere through + !! the Saturation Vapour Pressure + !! expression when using DO_SIMPLE !--- Pressure and Temperature constants real(kind=RKIND), public, parameter :: PSTD = 1.013250E+06_r8_kind !< Mean sea level pressure [dynes/cm^2] @@ -87,11 +99,16 @@ real(kind=RKIND), public, parameter :: AVOGNO = 6.023000E+23_r8_kind !< A real(kind=RKIND), public, parameter :: VONKARM = 0.40_r8_kind !< Von Karman constant [dimensionless] !--- Miscellaneous constants -real(kind=RKIND), public, parameter :: ALOGMIN = -50.0_r8_kind !< Minimum value allowed as argument to log function [N/A] -real(kind=RKIND), public, parameter :: EPSLN = 1.0E-40_r8_kind !< A small number to prevent divide by zero exceptions [N/A] -real(kind=RKIND), public, parameter :: RADCON = ((1.0E+02*GRAV)/(1.0D+04*CP_AIR))*SECONDS_PER_DAY !< Factor to convert flux divergence - !! to heating rate in degrees per day - !! [deg sec/(cm day)] -real(kind=RKIND), public, parameter :: RADCON_MKS = (GRAV/CP_AIR)*SECONDS_PER_DAY !< Factor to convert flux divergence - !! to heating rate in degrees per day - !! [deg sec/(m day)] +real(kind=RKIND), public, parameter :: ALOGMIN = -50.0_r8_kind !< Minimum value allowed as argument to + !! log function [N/A] +real(kind=RKIND), public, parameter :: EPSLN = 1.0E-40_r8_kind !< A small number to prevent divide by zero + !! exceptions [N/A] +real(kind=RKIND), public, parameter :: RADCON = ((1.0E+02*GRAV)/(1.0D+04*CP_AIR))*SECONDS_PER_DAY !< Factor to + !! convert flux divergence + !! to heating rate in degrees per day + !! [deg sec/(cm day)] + +real(kind=RKIND), public, parameter :: RADCON_MKS = (GRAV/CP_AIR)*SECONDS_PER_DAY !< Factor to + !! convert flux divergence + !! to heating rate in degrees per day + !! [deg sec/(m day)] diff --git a/constants4/gfdl_constantsR4.h b/constants4/gfdl_constantsR4.fh similarity index 74% rename from constants4/gfdl_constantsR4.h rename to constants4/gfdl_constantsR4.fh index e0bd9573ba..935445aa56 100644 --- a/constants4/gfdl_constantsR4.h +++ b/constants4/gfdl_constantsR4.fh @@ -23,11 +23,14 @@ character(len=20), public, parameter :: constantsR4_version = 'FMSConstantsR4: G real(kind=RKIND), public, parameter :: small_fac = 1._r8_kind !--- Spherical coordinate conversion constants -real(kind=r8_kind), public, parameter :: PI_8 = 3.14159265358979323846_r8_kind !< Ratio of circle circumference to diameter [N/A] -real(kind=RKIND), public, parameter :: PI = PI_8 !< Ratio of circle circumference to diameter [N/A] +real(kind=r8_kind), public, parameter :: PI_8 = 3.14159265358979323846_r8_kind !< Ratio of circle circumference + !! to diameter [N/A] +real(kind=RKIND), public, parameter :: PI = PI_8 !< Ratio of circle circumferen + !! to diameter [N/A] real(kind=RKIND), public, parameter :: RAD_TO_DEG = 180._r8_kind/PI_8 !< Degrees per radian [deg/rad] real(kind=RKIND), public, parameter :: DEG_TO_RAD = PI_8/180._r8_kind !< Radians per degree [rad/deg] -real(kind=RKIND), public, parameter :: RADIAN = RAD_TO_DEG !< Equal to RAD_TO_DEG for backward compatability. [rad/deg] +real(kind=RKIND), public, parameter :: RADIAN = RAD_TO_DEG !< Equal to RAD_TO_DEG for backward + !! compatability. [rad/deg] !--- Earth physical constants real(kind=RKIND), public, parameter :: RADIUS = 6371.0E+3_r8_kind !< Radius of the Earth [m] @@ -39,7 +42,8 @@ real(kind=RKIND), public, parameter :: SECONDS_PER_MINUTE = 60._r8_kind ! !--- Various gas constants real(kind=RKIND), public, parameter :: RDGAS = 287.04_r8_kind !< Gas constant for dry air [J/kg/deg] -real(kind=RKIND), public, parameter :: RVGAS = 461.50_r8_kind !< Gas constant for water vapor [J/kg/deg] +real(kind=RKIND), public, parameter :: RVGAS = 461.50_r8_kind !< Gas constant for water vapor + !! [J/kg/deg] real(kind=RKIND), public, parameter :: HLV = 2.500E6_r8_kind !< Latent heat of evaporation [J/kg] real(kind=RKIND), public, parameter :: HLF = 3.34E5_r8_kind !< Latent heat of fusion [J/kg] real(kind=RKIND), public, parameter :: HLS = HLV + HLF !< Latent heat of sublimation [J/kg] @@ -48,29 +52,37 @@ real(kind=RKIND), public, parameter :: CP_AIR = RDGAS/KAPPA !< S !! at constant pressure [J/kg/deg] real(kind=RKIND), public, parameter :: CP_VAPOR = 4.0_r8_kind*RVGAS !< Specific heat capacity of water vapor !! at constant pressure [J/kg/deg] -real(kind=RKIND), public, parameter :: CP_OCEAN = 3989.24495292815_r8_kind !< Specific heat capacity taken from McDougall (2002) +real(kind=RKIND), public, parameter :: CP_OCEAN = 3989.24495292815_r8_kind !< Specific heat capacity taken + !! from McDougall (2002) !! "Potential Enthalpy ..." [J/kg/deg] real(kind=RKIND), public, parameter :: DENS_H2O = 1000._r8_kind !< Density of liquid water [kg/m^3] real(kind=RKIND), public, parameter :: RHOAIR = 1.292269_r8_kind !< Reference atmospheric density [kg/m^3] real(kind=RKIND), public, parameter :: RHO0 = 1.035E3_r8_kind !< Average density of sea water [kg/m^3] -real(kind=RKIND), public, parameter :: RHO0R = 1.0_r8_kind/RHO0 !< Reciprocal of average density of sea water [m^3/kg] +real(kind=RKIND), public, parameter :: RHO0R = 1.0_r8_kind/RHO0 !< Reciprocal of average density of + !! sea water [m^3/kg] real(kind=RKIND), public, parameter :: RHO_CP = RHO0*CP_OCEAN !< (kg/m^3)*(cal/kg/deg C)(joules/cal) = !! (joules/m^3/deg C) [J/m^3/deg] -real(kind=RKIND), public, parameter :: O2MIXRAT = 2.0953E-01_r8_kind !< Mixing ratio of molecular oxygen in air [dimensionless] +real(kind=RKIND), public, parameter :: O2MIXRAT = 2.0953E-01_r8_kind !< Mixing ratio of molecular oxygen + !! in air [dimensionless] real(kind=RKIND), public, parameter :: WTMAIR = 2.896440E+01_r8_kind !< Molecular weight of air [AMU] real(kind=RKIND), public, parameter :: WTMH2O = WTMAIR*(RDGAS/RVGAS) !< Molecular weight of water [AMU] real(kind=RKIND), public, parameter :: WTMOZONE = 47.99820_r8_kind !< Molecular weight of ozone [AMU] real(kind=RKIND), public, parameter :: WTMC = 12.00000_r8_kind !< Molecular weight of carbon [AMU] -real(kind=RKIND), public, parameter :: WTMCO2 = 44.00995_r8_kind !< Molecular weight of carbon dioxide [AMU] +real(kind=RKIND), public, parameter :: WTMCO2 = 44.00995_r8_kind !< Molecular weight of carbon dioxide + !! [AMU] real(kind=RKIND), public, parameter :: WTMCH4 = 16.0425_r8_kind !< Molecular weight of methane [AMU] -real(kind=RKIND), public, parameter :: WTMO2 = 31.9988_r8_kind !< Molecular weight of molecular oxygen [AMU] -real(kind=RKIND), public, parameter :: WTMCFC11 = 137.3681_r8_kind !< Molecular weight of CFC-11 (CCl3F) [AMU] -real(kind=RKIND), public, parameter :: WTMCFC12 = 120.9135_r8_kind !< Molecular weight of CFC-21 (CCl2F2) [AMU] +real(kind=RKIND), public, parameter :: WTMO2 = 31.9988_r8_kind !< Molecular weight of molecular oxygen + !! [AMU] +real(kind=RKIND), public, parameter :: WTMCFC11 = 137.3681_r8_kind !< Molecular weight of CFC-11 + !! (CCl3F) [AMU] +real(kind=RKIND), public, parameter :: WTMCFC12 = 120.9135_r8_kind !< Molecular weight of CFC-21 + !! (CCl2F2) [AMU] real(kind=RKIND), public, parameter :: WTMN = 14.0067_r8_kind !< Molecular weight of Nitrogen [AMU] real(kind=RKIND), public, parameter :: DIFFAC = 1.660_r8_kind !< Diffusivity factor [dimensionless] real(kind=RKIND), public, parameter :: ES0 = 1.0_r8_kind !< Humidity factor [dimensionless] - !! Controls the humidity content of the atmosphere through - !! the Saturation Vapour Pressure expression + !! Controls the humidity content of + !! the atmosphere through the + !! Saturation Vapour Pressure expression !! when using DO_SIMPLE !--- Pressure and Temperature constants @@ -87,11 +99,15 @@ real(kind=RKIND), public, parameter :: AVOGNO = 6.023000E+23_r8_kind !< A real(kind=RKIND), public, parameter :: VONKARM = 0.40_r8_kind !< Von Karman constant [dimensionless] !--- Miscellaneous constants -real(kind=RKIND), public, parameter :: ALOGMIN = -50.0_r8_kind !< Minimum value allowed as argument to log function [N/A] -real(kind=RKIND), public, parameter :: EPSLN = 1.0E-40_r8_kind !< A small number to prevent divide by zero exceptions [N/A] -real(kind=RKIND), public, parameter :: RADCON = ((1.0E+02*GRAV)/(1.0D+04*CP_AIR))*SECONDS_PER_DAY !< Factor to convert flux divergence - !! to heating rate in degrees per day - !! [deg sec/(cm day)] -real(kind=RKIND), public, parameter :: RADCON_MKS = (GRAV/CP_AIR)*SECONDS_PER_DAY !< Factor to convert flux divergence - !! to heating rate in degrees per day - !! [deg sec/(m day)] +real(kind=RKIND), public, parameter :: ALOGMIN = -50.0_r8_kind !< Minimum value allowed as argument + !! to log function [N/A] +real(kind=RKIND), public, parameter :: EPSLN = 1.0E-40_r8_kind !< A small number to prevent divide by zero + !! exceptions [N/A] +real(kind=RKIND), public, parameter :: RADCON = ((1.0E+02*GRAV)/(1.0D+04*CP_AIR))*SECONDS_PER_DAY !< Factor to + !! convert flux divergence + !! to heating rate in degrees per day + !! [deg sec/(cm day)] +real(kind=RKIND), public, parameter :: RADCON_MKS = (GRAV/CP_AIR)*SECONDS_PER_DAY !< Factor to + !! convert flux divergence + !! to heating rate in degrees per day + !! [deg sec/(m day)] diff --git a/constants4/gfs_constantsR4.h b/constants4/gfs_constantsR4.fh similarity index 73% rename from constants4/gfs_constantsR4.h rename to constants4/gfs_constantsR4.fh index 04da7b0014..0a7178b8e6 100644 --- a/constants4/gfs_constantsR4.h +++ b/constants4/gfs_constantsR4.fh @@ -23,17 +23,22 @@ character(len=20), public, parameter :: constantsR4_version = 'FMSConstantsR4: G real(kind=RKIND), public, parameter :: small_fac = 1._r8_kind !--- Spherical coordinate conversion constants -real(kind=r8_kind), public, parameter :: PI_8 = 3.1415926535897931_r8_kind !< Ratio of circle circumference to diameter [N/A] -real(kind=RKIND), public, parameter :: PI = PI_8 !< Ratio of circle circumference to diameter [N/A] +real(kind=r8_kind), public, parameter :: PI_8 = 3.1415926535897931_r8_kind !< Ratio of circle circumference + !! to diameter [N/A] +real(kind=RKIND), public, parameter :: PI = PI_8 !< Ratio of circle circumference + !! to diameter [N/A] real(kind=RKIND), public, parameter :: RAD_TO_DEG = 180._r8_kind/PI_8 !< Degrees per radian [deg/rad] real(kind=RKIND), public, parameter :: DEG_TO_RAD = PI_8/180._r8_kind !< Radians per degree [rad/deg] -real(kind=RKIND), public, parameter :: RADIAN = RAD_TO_DEG !< Equal to RAD_TO_DEG for backward compatability. [rad/deg] +real(kind=RKIND), public, parameter :: RADIAN = RAD_TO_DEG !< Equal to RAD_TO_DEG for + !! backward compatability. [rad/deg] !--- Earth physical constants real(kind=RKIND), public, parameter :: RADIUS = 6.3712E+6_r8_kind !< Radius of the Earth [m] real(kind=RKIND), public, parameter :: OMEGA = 7.2921E-5_r8_kind !< Rotation rate of the Earth [1/s] -real(kind=r8_kind), public, parameter :: GRAV_8 = 9.80665_r8_kind !< Acceleration due to gravity [m/s^2] (REAL(KIND=8)) -real(kind=RKIND), public, parameter :: GRAV = GRAV_8 !< Acceleration due to gravity [m/s^2] +real(kind=r8_kind), public, parameter :: GRAV_8 = 9.80665_r8_kind !< Acceleration due to gravity + !! [m/s^2] (REAL(KIND=8)) +real(kind=RKIND), public, parameter :: GRAV = GRAV_8 !< Acceleration due to gravity + !! [m/s^2] real(kind=RKIND), public, parameter :: SECONDS_PER_DAY = 86400._r8_kind !< Seconds in a day [s] real(kind=RKIND), public, parameter :: SECONDS_PER_HOUR = 3600._r8_kind !< Seconds in an hour [s] real(kind=RKIND), public, parameter :: SECONDS_PER_MINUTE = 60._r8_kind !< Seconds in a minute [s] @@ -48,31 +53,39 @@ real(kind=RKIND), public, parameter :: CP_AIR = 1004.6_r8_kind !< S !! at constant pressure [J/kg/deg] real(kind=RKIND), public, parameter :: CP_VAPOR = 4.0_r8_kind*RVGAS !< Specific heat capacity of water vapor !! at constant pressure [J/kg/deg] -real(kind=RKIND), public, parameter :: CP_OCEAN = 3989.24495292815_r8_kind !< Specific heat capacity taken from McDougall (2002) +real(kind=RKIND), public, parameter :: CP_OCEAN = 3989.24495292815_r8_kind !< Specific heat capacity taken + !! from McDougall (2002) !! "Potential Enthalpy ..." [J/kg/deg] real(kind=RKIND), public, parameter :: KAPPA = RDGAS/CP_AIR !< RDGAS / CP_AIR [dimensionless] real(kind=RKIND), public, parameter :: DENS_H2O = 1000._r8_kind !< Density of liquid water [kg/m^3] real(kind=RKIND), public, parameter :: RHOAIR = 1.292269_r8_kind !< Reference atmospheric density [kg/m^3] real(kind=RKIND), public, parameter :: RHO0 = 1.035E3_r8_kind !< Average density of sea water [kg/m^3] -real(kind=RKIND), public, parameter :: RHO0R = 1.0_r8_kind/RHO0 !< Reciprocal of average density of sea water [m^3/kg] +real(kind=RKIND), public, parameter :: RHO0R = 1.0_r8_kind/RHO0 !< Reciprocal of average density + !! of sea water [m^3/kg] real(kind=RKIND), public, parameter :: RHO_CP = RHO0*CP_OCEAN !< (kg/m^3)*(cal/kg/deg C)(joules/cal) = !! (joules/m^3/deg C) [J/m^3/deg] -real(kind=RKIND), public, parameter :: O2MIXRAT = 2.0953E-01_r8_kind !< Mixing ratio of molecular oxygen in air [dimensionless] +real(kind=RKIND), public, parameter :: O2MIXRAT = 2.0953E-01_r8_kind !< Mixing ratio of molecular oxygen + !! in air [dimensionless] real(kind=RKIND), public, parameter :: WTMAIR = 2.896440E+01_r8_kind !< Molecular weight of air [AMU] real(kind=RKIND), public, parameter :: WTMH2O = WTMAIR*(RDGAS/RVGAS) !< Molecular weight of water [AMU] real(kind=RKIND), public, parameter :: WTMOZONE = 47.99820_r8_kind !< Molecular weight of ozone [AMU] real(kind=RKIND), public, parameter :: WTMC = 12.00000_r8_kind !< Molecular weight of carbon [AMU] -real(kind=RKIND), public, parameter :: WTMCO2 = 44.00995_r8_kind !< Molecular weight of carbon dioxide [AMU] +real(kind=RKIND), public, parameter :: WTMCO2 = 44.00995_r8_kind !< Molecular weight of carbon dioxide + !! [AMU] real(kind=RKIND), public, parameter :: WTMCH4 = 16.0425_r8_kind !< Molecular weight of methane [AMU] -real(kind=RKIND), public, parameter :: WTMO2 = 31.9988_r8_kind !< Molecular weight of molecular oxygen [AMU] -real(kind=RKIND), public, parameter :: WTMCFC11 = 137.3681_r8_kind !< Molecular weight of CFC-11 (CCl3F) [AMU] -real(kind=RKIND), public, parameter :: WTMCFC12 = 120.9135_r8_kind !< Molecular weight of CFC-21 (CCl2F2) [AMU] +real(kind=RKIND), public, parameter :: WTMO2 = 31.9988_r8_kind !< Molecular weight of molecular oxygen + !! [AMU] +real(kind=RKIND), public, parameter :: WTMCFC11 = 137.3681_r8_kind !< Molecular weight of CFC-11 + !! (CCl3F) [AMU] +real(kind=RKIND), public, parameter :: WTMCFC12 = 120.9135_r8_kind !< Molecular weight of CFC-21 + !! (CCl2F2) [AMU] real(kind=RKIND), public, parameter :: WTMN = 14.0067_r8_kind !< Molecular weight of Nitrogen [AMU] real(kind=RKIND), public, parameter :: DIFFAC = 1.660_r8_kind !< Diffusivity factor [dimensionless] real(kind=RKIND), public, parameter :: ES0 = 1.0_r8_kind !< Humidity factor [dimensionless] - !! Controls the humidity content of the atmosphere through - !! the Saturation Vapour Pressure expression - !! when using DO_SIMPLE + !! Controls the humidity content of the + !! atmosphere through + !! the Saturation Vapour Pressure + !! expression when using DO_SIMPLE real(kind=RKIND), public, parameter :: CON_CLIQ = 4.1855E+3_r8_kind !< Specific heat H2O liq [J/kg/K] real(kind=RKIND), public, parameter :: CON_CSOL = 2.1060E+3_r8_kind !< Specific heat H2O ice [J/kg/K] @@ -90,11 +103,16 @@ real(kind=RKIND), public, parameter :: AVOGNO = 6.023000E+23_r8_kind !< A real(kind=RKIND), public, parameter :: VONKARM = 0.40_r8_kind !< Von Karman constant [dimensionless] !--- Miscellaneous constants -real(kind=RKIND), public, parameter :: ALOGMIN = -50.0_r8_kind !< Minimum value allowed as argument to log function [N/A] -real(kind=RKIND), public, parameter :: EPSLN = 1.0E-40_r8_kind !< A small number to prevent divide by zero exceptions [N/A] -real(kind=RKIND), public, parameter :: RADCON = ((1.0D+02*GRAV)/(1.0D+04*CP_AIR))*SECONDS_PER_DAY !< Factor to convert flux divergence - !! to heating rate in degrees per day - !! [deg sec/(cm day)] -real(kind=RKIND), public, parameter :: RADCON_MKS = (GRAV/CP_AIR)*SECONDS_PER_DAY !< Factor to convert flux divergence - !! to heating rate in degrees per day - !! [deg sec/(m day)] +real(kind=RKIND), public, parameter :: ALOGMIN = -50.0_r8_kind !< Minimum value allowed as argument to + !! log function [N/A] +real(kind=RKIND), public, parameter :: EPSLN = 1.0E-40_r8_kind !< A small number to prevent divide by + !! zero exceptions [N/A] +real(kind=RKIND), public, parameter :: RADCON = ((1.0D+02*GRAV)/(1.0D+04*CP_AIR))*SECONDS_PER_DAY !< Factor to + !! convert flux divergence + !! to heating rate in degrees per day + !! [deg sec/(cm day)] + +real(kind=RKIND), public, parameter :: RADCON_MKS = (GRAV/CP_AIR)*SECONDS_PER_DAY !< Factor to + !! convert flux divergence + !! to heating rate in degrees per day + !! [deg sec/(m day)] diff --git a/drifters/Makefile.am b/drifters/Makefile.am index 521e18907e..f365f8e1f2 100644 --- a/drifters/Makefile.am +++ b/drifters/Makefile.am @@ -41,9 +41,9 @@ libdrifters_la_SOURCES = drifters.F90 \ drifters_io.F90 \ cloud_interpolator.F90 \ quicksort.F90 \ - drifters_compute_k.h \ - drifters_push.h \ - drifters_set_field.h \ + drifters_compute_k.fh \ + drifters_push.fh \ + drifters_set_field.fh \ fms_switches.h drifters_mod.$(FC_MODEXT): drifters_core_mod.$(FC_MODEXT) drifters_input_mod.$(FC_MODEXT) drifters_io_mod.$(FC_MODEXT) \ diff --git a/drifters/drifters.F90 b/drifters/drifters.F90 index ab1bcdc395..eac1d6cbd8 100644 --- a/drifters/drifters.F90 +++ b/drifters/drifters.F90 @@ -89,8 +89,9 @@ module drifters_mod drifters_io_set_position_names, drifters_io_set_position_units, & drifters_io_set_field_names, drifters_io_set_field_units, drifters_io_write - use drifters_comm_mod, only: drifters_comm_type,drifters_comm_new,drifters_comm_del,drifters_comm_set_pe_neighbors,& - drifters_comm_set_domain, drifters_comm_gather, drifters_comm_update + use drifters_comm_mod, only: drifters_comm_type,drifters_comm_new,drifters_comm_del, & + drifters_comm_set_pe_neighbors, drifters_comm_set_domain, & + drifters_comm_gather, drifters_comm_update use cloud_interpolator_mod, only: cld_ntrp_linear_cell_interp, cld_ntrp_locate_cell, cld_ntrp_get_cell_values implicit none @@ -462,14 +463,14 @@ end subroutine drifters_set_pe_neighbors !============================================================================ #define _DIMS 2 #define drifters_push_XXX drifters_push_2 -#include "drifters_push.h" +#include "drifters_push.fh" #undef _DIMS #undef drifters_push_XXX !============================================================================ #define _DIMS 3 #define drifters_push_XXX drifters_push_3 -#include "drifters_push.h" +#include "drifters_push.fh" #undef _DIMS #undef drifters_push_XXX @@ -506,14 +507,14 @@ end subroutine drifters_modulo !============================================================================ #define _DIMS 2 #define drifters_set_field_XXX drifters_set_field_2d -#include "drifters_set_field.h" +#include "drifters_set_field.fh" #undef _DIMS #undef drifters_set_field_XXX !============================================================================ #define _DIMS 3 #define drifters_set_field_XXX drifters_set_field_3d -#include "drifters_set_field.h" +#include "drifters_set_field.fh" #undef _DIMS #undef drifters_set_field_XXX !============================================================================ @@ -644,14 +645,14 @@ end subroutine drifters_write_restart !============================================================================ #define _DIMS 2 #define drifters_compute_k_XXX drifters_computek2d -#include "drifters_compute_k.h" +#include "drifters_compute_k.fh" #undef _DIMS #undef drifters_compute_k_XXX !============================================================================ #define _DIMS 3 #define drifters_compute_k_XXX drifters_computek3d -#include "drifters_compute_k.h" +#include "drifters_compute_k.fh" #undef _DIMS #undef drifters_compute_k_XXX diff --git a/drifters/drifters_compute_k.h b/drifters/drifters_compute_k.fh similarity index 100% rename from drifters/drifters_compute_k.h rename to drifters/drifters_compute_k.fh diff --git a/drifters/drifters_push.h b/drifters/drifters_push.fh similarity index 100% rename from drifters/drifters_push.h rename to drifters/drifters_push.fh diff --git a/drifters/drifters_set_field.h b/drifters/drifters_set_field.fh similarity index 93% rename from drifters/drifters_set_field.h rename to drifters/drifters_set_field.fh index ab8a4b583f..9ca2a2acf5 100644 --- a/drifters/drifters_set_field.h +++ b/drifters/drifters_set_field.fh @@ -76,7 +76,8 @@ subroutine drifters_set_field_XXX(self, index_field, x, y, & ij(1) = i #ifdef _DEBUG if(i<1) then - print *,'drifters_set_field_XXX::OUT OF BOUND ERROR. xmin, x, xmax=', minval(x), self%core%positions(1,ip), maxval(x) + print *,'drifters_set_field_XXX::OUT OF BOUND ERROR. xmin, x, xmax=', & + & minval(x), self%core%positions(1,ip), maxval(x) endif #endif ts(1) = (self%core%positions(1,ip) - x(i))/(x(i+1) - x(i)) @@ -85,7 +86,8 @@ subroutine drifters_set_field_XXX(self, index_field, x, y, & ij(2) = j #ifdef _DEBUG if(j<1) then - print *,'drifters_set_field_XXX::OUT OF BOUND ERROR. ymin, y, ymax=', minval(y), self%core%positions(2,ip), maxval(y) + print *,'drifters_set_field_XXX::OUT OF BOUND ERROR. ymin, y, ymax=', & + & minval(y), self%core%positions(2,ip), maxval(y) endif #endif ts(2) = (self%core%positions(2,ip) - y(j))/(y(j+1) - y(j)) @@ -95,7 +97,8 @@ subroutine drifters_set_field_XXX(self, index_field, x, y, & ij(3) = j #ifdef _DEBUG if(j<1) then - print *,'drifters_set_field_XXX::OUT OF BOUND ERROR. ymin, y, ymax=', minval(y), self%core%positions(2,ip), maxval(y) + print *,'drifters_set_field_XXX::OUT OF BOUND ERROR. ymin, y, ymax=', & + & minval(y), self%core%positions(2,ip), maxval(y) endif #endif ts(3) = (self%core%positions(3,ip) - z(j))/(z(j+1) - z(j)) diff --git a/mpp/Makefile.am b/mpp/Makefile.am index 150127c315..c7e482ea13 100644 --- a/mpp/Makefile.am +++ b/mpp/Makefile.am @@ -22,7 +22,7 @@ # Ed Hartnett 2/22/19 -# Include .h and .mod files. +# Include .fh and .mod files. AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/mpp/include @@ -43,51 +43,51 @@ libmpp_la_SOURCES = \ mpp_pset.F90 \ include/group_update_pack.inc \ include/group_update_unpack.inc \ - include/mpp_alltoall_mpi.h \ - include/mpp_alltoall_nocomm.h \ - include/mpp_chksum.h \ - include/mpp_chksum_int.h \ - include/mpp_chksum_scalar.h \ + include/mpp_alltoall_mpi.fh \ + include/mpp_alltoall_nocomm.fh \ + include/mpp_chksum.fh \ + include/mpp_chksum_int.fh \ + include/mpp_chksum_scalar.fh \ include/mpp_comm.inc \ include/mpp_comm_mpi.inc \ include/mpp_comm_nocomm.inc \ include/mpp_data_mpi.inc \ include/mpp_data_nocomm.inc \ include/mpp_define_nest_domains.inc \ - include/mpp_do_check.h \ - include/mpp_do_checkV.h \ - include/mpp_do_get_boundary.h \ - include/mpp_do_get_boundary_ad.h \ - include/mpp_do_global_field.h \ - include/mpp_do_global_field_ad.h \ - include/mpp_do_redistribute.h \ - include/mpp_do_update.h \ - include/mpp_do_updateV.h \ - include/mpp_do_updateV_ad.h \ - include/mpp_do_updateV_nonblock.h \ - include/mpp_do_update_ad.h \ - include/mpp_do_update_nest.h \ - include/mpp_do_update_nonblock.h \ + include/mpp_do_check.fh \ + include/mpp_do_checkV.fh \ + include/mpp_do_get_boundary.fh \ + include/mpp_do_get_boundary_ad.fh \ + include/mpp_do_global_field.fh \ + include/mpp_do_global_field_ad.fh \ + include/mpp_do_redistribute.fh \ + include/mpp_do_update.fh \ + include/mpp_do_updateV.fh \ + include/mpp_do_updateV_ad.fh \ + include/mpp_do_updateV_nonblock.fh \ + include/mpp_do_update_ad.fh \ + include/mpp_do_update_nest.fh \ + include/mpp_do_update_nonblock.fh \ include/mpp_domains_comm.inc \ include/mpp_domains_define.inc \ include/mpp_domains_misc.inc \ include/mpp_domains_reduce.inc \ include/mpp_domains_util.inc \ - include/mpp_error_a_a.h \ - include/mpp_error_a_s.h \ - include/mpp_error_s_a.h \ - include/mpp_error_s_s.h \ - include/mpp_gather.h \ - include/mpp_get_boundary.h \ - include/mpp_get_boundary_ad.h \ - include/mpp_global_field.h \ - include/mpp_global_field_ad.h \ - include/mpp_global_field_ug.h \ - include/mpp_global_reduce.h \ - include/mpp_global_sum.h \ - include/mpp_global_sum_ad.h \ - include/mpp_global_sum_tl.h \ - include/mpp_group_update.h \ + include/mpp_error_a_a.fh \ + include/mpp_error_a_s.fh \ + include/mpp_error_s_a.fh \ + include/mpp_error_s_s.fh \ + include/mpp_gather.fh \ + include/mpp_get_boundary.fh \ + include/mpp_get_boundary_ad.fh \ + include/mpp_global_field.fh \ + include/mpp_global_field_ad.fh \ + include/mpp_global_field_ug.fh \ + include/mpp_global_reduce.fh \ + include/mpp_global_sum.fh \ + include/mpp_global_sum_ad.fh \ + include/mpp_global_sum_tl.fh \ + include/mpp_group_update.fh \ include/mpp_io_connect.inc \ include/mpp_io_misc.inc \ include/mpp_io_read.inc \ @@ -95,73 +95,73 @@ libmpp_la_SOURCES = \ include/mpp_io_unstructured_write.inc \ include/mpp_io_util.inc \ include/mpp_io_write.inc \ - include/mpp_read_2Ddecomp.h \ - include/mpp_read_compressed.h \ - include/mpp_read_distributed_ascii.h \ + include/mpp_read_2Ddecomp.fh \ + include/mpp_read_compressed.fh \ + include/mpp_read_distributed_ascii.fh \ include/mpp_read_distributed_ascii.inc \ - include/mpp_reduce_mpi.h \ - include/mpp_reduce_nocomm.h \ - include/mpp_scatter.h \ + include/mpp_reduce_mpi.fh \ + include/mpp_reduce_nocomm.fh \ + include/mpp_scatter.fh \ include/mpp_sum.inc \ include/mpp_sum_ad.inc \ - include/mpp_sum_mpi.h \ - include/mpp_sum_mpi_ad.h \ - include/mpp_sum_nocomm.h \ - include/mpp_sum_nocomm_ad.h \ + include/mpp_sum_mpi.fh \ + include/mpp_sum_mpi_ad.fh \ + include/mpp_sum_nocomm.fh \ + include/mpp_sum_nocomm_ad.fh \ include/mpp_transmit.inc \ - include/mpp_transmit_mpi.h \ - include/mpp_transmit_nocomm.h \ - include/mpp_type_mpi.h \ - include/mpp_type_nocomm.h \ + include/mpp_transmit_mpi.fh \ + include/mpp_transmit_nocomm.fh \ + include/mpp_type_mpi.fh \ + include/mpp_type_nocomm.fh \ include/mpp_unstruct_domain.inc \ - include/mpp_unstruct_pass_data.h \ - include/mpp_update_domains2D.h \ - include/mpp_update_domains2D_ad.h \ - include/mpp_update_domains2D_nonblock.h \ - include/mpp_update_nest_domains.h \ + include/mpp_unstruct_pass_data.fh \ + include/mpp_update_domains2D.fh \ + include/mpp_update_domains2D_ad.fh \ + include/mpp_update_domains2D_nonblock.fh \ + include/mpp_update_nest_domains.fh \ include/mpp_util.inc \ include/mpp_util_mpi.inc \ include/mpp_util_nocomm.inc \ - include/mpp_write.h \ - include/mpp_write_2Ddecomp.h \ - include/mpp_write_compressed.h \ - include/mpp_write_unlimited_axis.h \ - include/system_clock.h + include/mpp_write.fh \ + include/mpp_write_2Ddecomp.fh \ + include/mpp_write_compressed.fh \ + include/mpp_write_unlimited_axis.fh \ + include/system_clock.fh mpp_mod.$(FC_MODEXT): \ mpp_parameter_mod.$(FC_MODEXT) \ mpp_data_mod.$(FC_MODEXT) \ include/mpp_util.inc \ - include/mpp_error_a_a.h \ - include/mpp_error_a_s.h \ - include/mpp_error_s_a.h \ - include/mpp_error_s_s.h \ + include/mpp_error_a_a.fh \ + include/mpp_error_a_s.fh \ + include/mpp_error_s_a.fh \ + include/mpp_error_s_s.fh \ include/mpp_util_mpi.inc \ include/mpp_util_nocomm.inc \ include/mpp_comm.inc \ - include/mpp_chksum.h \ - include/mpp_chksum_int.h \ - include/mpp_chksum_scalar.h \ + include/mpp_chksum.fh \ + include/mpp_chksum_int.fh \ + include/mpp_chksum_scalar.fh \ include/mpp_comm_mpi.inc \ - include/mpp_alltoall_mpi.h \ - include/mpp_reduce_mpi.h \ - include/mpp_sum_mpi.h \ + include/mpp_alltoall_mpi.fh \ + include/mpp_reduce_mpi.fh \ + include/mpp_sum_mpi.fh \ include/mpp_sum.inc \ - include/mpp_sum_mpi_ad.h \ + include/mpp_sum_mpi_ad.fh \ include/mpp_sum_ad.inc \ - include/mpp_transmit_mpi.h \ + include/mpp_transmit_mpi.fh \ include/mpp_transmit.inc \ - include/mpp_type_mpi.h \ + include/mpp_type_mpi.fh \ include/mpp_comm_nocomm.inc \ - include/mpp_alltoall_nocomm.h \ - include/mpp_reduce_nocomm.h \ - include/mpp_sum_nocomm.h \ - include/mpp_sum_nocomm_ad.h \ - include/mpp_transmit_nocomm.h \ - include/mpp_type_nocomm.h \ - include/mpp_gather.h \ - include/mpp_scatter.h \ - include/system_clock.h + include/mpp_alltoall_nocomm.fh \ + include/mpp_reduce_nocomm.fh \ + include/mpp_sum_nocomm.fh \ + include/mpp_sum_nocomm_ad.fh \ + include/mpp_transmit_nocomm.fh \ + include/mpp_type_nocomm.fh \ + include/mpp_gather.fh \ + include/mpp_scatter.fh \ + include/system_clock.fh mpp_data_mod.$(FC_MODEXT): \ mpp_parameter_mod.$(FC_MODEXT) \ include/mpp_data_mpi.inc \ @@ -180,39 +180,39 @@ mpp_domains_mod.$(FC_MODEXT): \ include/mpp_domains_comm.inc \ include/mpp_domains_define.inc \ include/mpp_domains_misc.inc \ - include/mpp_do_check.h \ - include/mpp_do_checkV.h \ - include/mpp_do_get_boundary.h \ - include/mpp_do_get_boundary_ad.h \ - include/mpp_do_redistribute.h \ - include/mpp_do_update.h \ - include/mpp_do_updateV.h \ - include/mpp_do_updateV_ad.h \ - include/mpp_do_updateV_nonblock.h \ - include/mpp_do_update_ad.h \ - include/mpp_do_update_nest.h \ - include/mpp_do_update_nonblock.h \ - include/mpp_get_boundary.h \ - include/mpp_get_boundary_ad.h \ - include/mpp_group_update.h \ + include/mpp_do_check.fh \ + include/mpp_do_checkV.fh \ + include/mpp_do_get_boundary.fh \ + include/mpp_do_get_boundary_ad.fh \ + include/mpp_do_redistribute.fh \ + include/mpp_do_update.fh \ + include/mpp_do_updateV.fh \ + include/mpp_do_updateV_ad.fh \ + include/mpp_do_updateV_nonblock.fh \ + include/mpp_do_update_ad.fh \ + include/mpp_do_update_nest.fh \ + include/mpp_do_update_nonblock.fh \ + include/mpp_get_boundary.fh \ + include/mpp_get_boundary_ad.fh \ + include/mpp_group_update.fh \ include/group_update_pack.inc \ include/group_update_unpack.inc \ - include/mpp_update_domains2D.h \ - include/mpp_update_domains2D_ad.h \ - include/mpp_update_domains2D_nonblock.h \ - include/mpp_update_nest_domains.h \ + include/mpp_update_domains2D.fh \ + include/mpp_update_domains2D_ad.fh \ + include/mpp_update_domains2D_nonblock.fh \ + include/mpp_update_nest_domains.fh \ include/mpp_domains_reduce.inc \ - include/mpp_do_global_field.h \ - include/mpp_do_global_field_ad.h \ - include/mpp_global_field.h \ - include/mpp_global_field_ad.h \ - include/mpp_global_reduce.h \ - include/mpp_global_sum.h \ - include/mpp_global_sum_ad.h \ - include/mpp_global_sum_tl.h \ + include/mpp_do_global_field.fh \ + include/mpp_do_global_field_ad.fh \ + include/mpp_global_field.fh \ + include/mpp_global_field_ad.fh \ + include/mpp_global_reduce.fh \ + include/mpp_global_sum.fh \ + include/mpp_global_sum_ad.fh \ + include/mpp_global_sum_tl.fh \ include/mpp_unstruct_domain.inc \ - include/mpp_global_field_ug.h \ - include/mpp_unstruct_pass_data.h + include/mpp_global_field_ug.fh \ + include/mpp_unstruct_pass_data.fh mpp_io_mod.$(FC_MODEXT): \ mpp_parameter_mod.$(FC_MODEXT) \ mpp_mod.$(FC_MODEXT) \ @@ -221,15 +221,15 @@ mpp_io_mod.$(FC_MODEXT): \ include/mpp_io_misc.inc \ include/mpp_io_connect.inc \ include/mpp_io_read.inc \ - include/mpp_read_2Ddecomp.h \ - include/mpp_read_compressed.h \ + include/mpp_read_2Ddecomp.fh \ + include/mpp_read_compressed.fh \ include/mpp_read_distributed_ascii.inc \ - include/mpp_read_distributed_ascii.h \ + include/mpp_read_distributed_ascii.fh \ include/mpp_io_write.inc \ - include/mpp_write.h \ - include/mpp_write_2Ddecomp.h \ - include/mpp_write_compressed.h \ - include/mpp_write_unlimited_axis.h \ + include/mpp_write.fh \ + include/mpp_write_2Ddecomp.fh \ + include/mpp_write_compressed.fh \ + include/mpp_write_unlimited_axis.fh \ include/mpp_io_unstructured_write.inc \ include/mpp_io_unstructured_read.inc mpp_efp_mod.$(FC_MODEXT): mpp_parameter_mod.$(FC_MODEXT) mpp_mod.$(FC_MODEXT) diff --git a/mpp/include/mpp_alltoall_mpi.h b/mpp/include/mpp_alltoall_mpi.fh similarity index 100% rename from mpp/include/mpp_alltoall_mpi.h rename to mpp/include/mpp_alltoall_mpi.fh diff --git a/mpp/include/mpp_alltoall_nocomm.h b/mpp/include/mpp_alltoall_nocomm.fh similarity index 100% rename from mpp/include/mpp_alltoall_nocomm.h rename to mpp/include/mpp_alltoall_nocomm.fh diff --git a/mpp/include/mpp_chksum.h b/mpp/include/mpp_chksum.fh similarity index 100% rename from mpp/include/mpp_chksum.h rename to mpp/include/mpp_chksum.fh diff --git a/mpp/include/mpp_chksum_int.h b/mpp/include/mpp_chksum_int.fh similarity index 100% rename from mpp/include/mpp_chksum_int.h rename to mpp/include/mpp_chksum_int.fh diff --git a/mpp/include/mpp_chksum_scalar.h b/mpp/include/mpp_chksum_scalar.fh similarity index 100% rename from mpp/include/mpp_chksum_scalar.h rename to mpp/include/mpp_chksum_scalar.fh diff --git a/mpp/include/mpp_comm.inc b/mpp/include/mpp_comm.inc index 22489fbb37..2355102ea9 100644 --- a/mpp/include/mpp_comm.inc +++ b/mpp/include/mpp_comm.inc @@ -39,7 +39,7 @@ #define MPP_TYPE_ integer(i8_kind) #undef MPP_RANK_ #define MPP_RANK_ (:) -#include +#include #undef MPP_CHKSUM_INT_ #define MPP_CHKSUM_INT_ mpp_chksum_i8_2d @@ -49,7 +49,7 @@ #define MPP_TYPE_ integer(i8_kind) #undef MPP_RANK_ #define MPP_RANK_ (:,:) -#include +#include #undef MPP_CHKSUM_INT_ #define MPP_CHKSUM_INT_ mpp_chksum_i8_3d @@ -59,7 +59,7 @@ #define MPP_TYPE_ integer(i8_kind) #undef MPP_RANK_ #define MPP_RANK_ (:,:,:) -#include +#include #undef MPP_CHKSUM_INT_ #define MPP_CHKSUM_INT_ mpp_chksum_i8_4d @@ -69,7 +69,7 @@ #define MPP_TYPE_ integer(i8_kind) #undef MPP_RANK_ #define MPP_RANK_ (:,:,:,:) -#include +#include #undef MPP_CHKSUM_INT_ #define MPP_CHKSUM_INT_ mpp_chksum_i8_5d @@ -79,7 +79,7 @@ #define MPP_TYPE_ integer(i8_kind) #undef MPP_RANK_ #define MPP_RANK_ (:,:,:,:,:) -#include +#include #undef MPP_CHKSUM_INT_ #define MPP_CHKSUM_INT_ mpp_chksum_i4_1d @@ -89,7 +89,7 @@ #define MPP_TYPE_ integer(i4_kind) #undef MPP_RANK_ #define MPP_RANK_ (:) -#include +#include #undef MPP_CHKSUM_INT_ #define MPP_CHKSUM_INT_ mpp_chksum_i4_2d @@ -99,7 +99,7 @@ #define MPP_TYPE_ integer(i4_kind) #undef MPP_RANK_ #define MPP_RANK_ (:,:) -#include +#include #undef MPP_CHKSUM_INT_ #define MPP_CHKSUM_INT_ mpp_chksum_i4_3d @@ -109,7 +109,7 @@ #define MPP_TYPE_ integer(i4_kind) #undef MPP_RANK_ #define MPP_RANK_ (:,:,:) -#include +#include #undef MPP_CHKSUM_INT_ #define MPP_CHKSUM_INT_ mpp_chksum_i4_4d @@ -119,7 +119,7 @@ #define MPP_TYPE_ integer(i4_kind) #undef MPP_RANK_ #define MPP_RANK_ (:,:,:,:) -#include +#include #undef MPP_CHKSUM_INT_ #define MPP_CHKSUM_INT_ mpp_chksum_i4_5d @@ -129,7 +129,7 @@ #define MPP_TYPE_ integer(i4_kind) #undef MPP_RANK_ #define MPP_RANK_ (:,:,:,:,:) -#include +#include #undef MPP_CHKSUM_ #define MPP_CHKSUM_ mpp_chksum_r8_0d @@ -137,7 +137,7 @@ #define MPP_TYPE_ real(r8_kind) #undef MPP_RANK_ #define MPP_RANK_ ! -#include +#include #undef MPP_CHKSUM_ #define MPP_CHKSUM_ mpp_chksum_r8_1d @@ -147,7 +147,7 @@ #define MPP_TYPE_ real(r8_kind) #undef MPP_RANK_ #define MPP_RANK_ (:) -#include +#include #undef MPP_CHKSUM_ #define MPP_CHKSUM_ mpp_chksum_r8_2d @@ -157,7 +157,7 @@ #define MPP_TYPE_ real(r8_kind) #undef MPP_RANK_ #define MPP_RANK_ (:,:) -#include +#include #undef MPP_CHKSUM_ #define MPP_CHKSUM_ mpp_chksum_r8_3d @@ -167,7 +167,7 @@ #define MPP_TYPE_ real(r8_kind) #undef MPP_RANK_ #define MPP_RANK_ (:,:,:) -#include +#include #undef MPP_CHKSUM_ #define MPP_CHKSUM_ mpp_chksum_r8_4d @@ -177,7 +177,7 @@ #define MPP_TYPE_ real(r8_kind) #undef MPP_RANK_ #define MPP_RANK_ (:,:,:,:) -#include +#include #undef MPP_CHKSUM_ #define MPP_CHKSUM_ mpp_chksum_r8_5d @@ -187,7 +187,7 @@ #define MPP_TYPE_ real(r8_kind) #undef MPP_RANK_ #define MPP_RANK_ (:,:,:,:,:) -#include +#include #ifdef OVERLOAD_C8 #undef MPP_CHKSUM_ @@ -198,7 +198,7 @@ #define MPP_TYPE_ complex(c8_kind) #undef MPP_RANK_ #define MPP_RANK_ ! -#include +#include #undef MPP_CHKSUM_ #define MPP_CHKSUM_ mpp_chksum_c8_1d @@ -208,7 +208,7 @@ #define MPP_TYPE_ complex(c8_kind) #undef MPP_RANK_ #define MPP_RANK_ (:) -#include +#include #undef MPP_CHKSUM_ #define MPP_CHKSUM_ mpp_chksum_c8_2d @@ -218,7 +218,7 @@ #define MPP_TYPE_ complex(c8_kind) #undef MPP_RANK_ #define MPP_RANK_ (:,:) -#include +#include #undef MPP_CHKSUM_ #define MPP_CHKSUM_ mpp_chksum_c8_3d @@ -228,7 +228,7 @@ #define MPP_TYPE_ complex(c8_kind) #undef MPP_RANK_ #define MPP_RANK_ (:,:,:) -#include +#include #undef MPP_CHKSUM_ #define MPP_CHKSUM_ mpp_chksum_c8_4d @@ -238,7 +238,7 @@ #define MPP_TYPE_ complex(c8_kind) #undef MPP_RANK_ #define MPP_RANK_ (:,:,:,:) -#include +#include #undef MPP_CHKSUM_ #define MPP_CHKSUM_ mpp_chksum_c8_5d @@ -248,7 +248,7 @@ #define MPP_TYPE_ complex(c8_kind) #undef MPP_RANK_ #define MPP_RANK_ (:,:,:,:,:) -#include +#include #endif #undef MPP_CHKSUM_ @@ -259,7 +259,7 @@ #define MPP_TYPE_ real(r4_kind) #undef MPP_RANK_ #define MPP_RANK_ ! -#include +#include #undef MPP_CHKSUM_ #define MPP_CHKSUM_ mpp_chksum_r4_1d @@ -269,7 +269,7 @@ #define MPP_TYPE_ real(r4_kind) #undef MPP_RANK_ #define MPP_RANK_ (:) -#include +#include #undef MPP_CHKSUM_ #define MPP_CHKSUM_ mpp_chksum_r4_2d @@ -279,7 +279,7 @@ #define MPP_TYPE_ real(r4_kind) #undef MPP_RANK_ #define MPP_RANK_ (:,:) -#include +#include #undef MPP_CHKSUM_ #define MPP_CHKSUM_ mpp_chksum_r4_3d @@ -289,7 +289,7 @@ #define MPP_TYPE_ real(r4_kind) #undef MPP_RANK_ #define MPP_RANK_ (:,:,:) -#include +#include #undef MPP_CHKSUM_ #define MPP_CHKSUM_ mpp_chksum_r4_4d @@ -299,7 +299,7 @@ #define MPP_TYPE_ real(r4_kind) #undef MPP_RANK_ #define MPP_RANK_ (:,:,:,:) -#include +#include #undef MPP_CHKSUM_ #define MPP_CHKSUM_ mpp_chksum_r4_5d @@ -309,7 +309,7 @@ #define MPP_TYPE_ real(r4_kind) #undef MPP_RANK_ #define MPP_RANK_ (:,:,:,:,:) -#include +#include #ifdef OVERLOAD_C4 #undef MPP_CHKSUM_ @@ -320,7 +320,7 @@ #define MPP_TYPE_ complex(c4_kind) #undef MPP_RANK_ #define MPP_RANK_ ! -#include +#include #undef MPP_CHKSUM_ #define MPP_CHKSUM_ mpp_chksum_c4_1d @@ -330,7 +330,7 @@ #define MPP_TYPE_ complex(c4_kind) #undef MPP_RANK_ #define MPP_RANK_ (:) -#include +#include #undef MPP_CHKSUM_ #define MPP_CHKSUM_ mpp_chksum_c4_2d @@ -340,7 +340,7 @@ #define MPP_TYPE_ complex(c4_kind) #undef MPP_RANK_ #define MPP_RANK_ (:,:) -#include +#include #undef MPP_CHKSUM_ #define MPP_CHKSUM_ mpp_chksum_c4_3d @@ -350,7 +350,7 @@ #define MPP_TYPE_ complex(c4_kind) #undef MPP_RANK_ #define MPP_RANK_ (:,:,:) -#include +#include #undef MPP_CHKSUM_ #define MPP_CHKSUM_ mpp_chksum_c4_4d @@ -360,7 +360,7 @@ #define MPP_TYPE_ complex(c4_kind) #undef MPP_RANK_ #define MPP_RANK_ (:,:,:,:) -#include +#include #undef MPP_CHKSUM_ #define MPP_CHKSUM_ mpp_chksum_c4_5d @@ -370,7 +370,7 @@ #define MPP_TYPE_ complex(c4_kind) #undef MPP_RANK_ #define MPP_RANK_ (:,:,:,:,:) -#include +#include #endif !################################################# @@ -384,7 +384,7 @@ #undef MPP_GATHER_PELIST_3D_ #define MPP_GATHER_PELIST_2D_ mpp_gather_pelist_logical_2d #define MPP_GATHER_PELIST_3D_ mpp_gather_pelist_logical_3d -#include +#include #undef MPP_GATHER_1D_ #undef MPP_GATHER_1DV_ @@ -396,7 +396,7 @@ #undef MPP_GATHER_PELIST_3D_ #define MPP_GATHER_PELIST_2D_ mpp_gather_pelist_int4_2d #define MPP_GATHER_PELIST_3D_ mpp_gather_pelist_int4_3d -#include +#include #undef MPP_GATHER_1D_ #undef MPP_GATHER_1DV_ @@ -408,7 +408,7 @@ #undef MPP_GATHER_PELIST_3D_ #define MPP_GATHER_PELIST_2D_ mpp_gather_pelist_real4_2d #define MPP_GATHER_PELIST_3D_ mpp_gather_pelist_real4_3d -#include +#include #undef MPP_GATHER_1D_ #undef MPP_GATHER_1DV_ @@ -420,7 +420,7 @@ #undef MPP_GATHER_PELIST_3D_ #define MPP_GATHER_PELIST_2D_ mpp_gather_pelist_real8_2d #define MPP_GATHER_PELIST_3D_ mpp_gather_pelist_real8_3d -#include +#include !################################################# #undef MPP_SCATTER_PELIST_2D_ @@ -429,7 +429,7 @@ #define MPP_TYPE_ integer(i4_kind) #define MPP_SCATTER_PELIST_2D_ mpp_scatter_pelist_int4_2d #define MPP_SCATTER_PELIST_3D_ mpp_scatter_pelist_int4_3d -#include +#include #undef MPP_SCATTER_PELIST_2D_ #undef MPP_SCATTER_PELIST_3D_ @@ -437,7 +437,7 @@ #define MPP_TYPE_ real(r4_kind) #define MPP_SCATTER_PELIST_2D_ mpp_scatter_pelist_real4_2d #define MPP_SCATTER_PELIST_3D_ mpp_scatter_pelist_real4_3d -#include +#include #undef MPP_SCATTER_PELIST_2D_ #undef MPP_SCATTER_PELIST_3D_ @@ -445,5 +445,5 @@ #define MPP_TYPE_ real(r8_kind) #define MPP_SCATTER_PELIST_2D_ mpp_scatter_pelist_real8_2d #define MPP_SCATTER_PELIST_3D_ mpp_scatter_pelist_real8_3d -#include +#include !> @} diff --git a/mpp/include/mpp_comm_mpi.inc b/mpp/include/mpp_comm_mpi.inc index ac6df35894..928f9fcb92 100644 --- a/mpp/include/mpp_comm_mpi.inc +++ b/mpp/include/mpp_comm_mpi.inc @@ -414,7 +414,7 @@ end subroutine mpp_exit #define MPP_TYPE_BYTELEN_ 8 #undef MPI_TYPE_ #define MPI_TYPE_ MPI_REAL8 -#include +#include #ifdef OVERLOAD_C8 #undef MPP_TRANSMIT_ @@ -471,7 +471,7 @@ end subroutine mpp_exit #define MPP_TYPE_BYTELEN_ 16 #undef MPI_TYPE_ #define MPI_TYPE_ MPI_DOUBLE_COMPLEX -#include +#include #endif #undef MPP_TRANSMIT_ @@ -528,7 +528,7 @@ end subroutine mpp_exit #define MPP_TYPE_BYTELEN_ 4 #undef MPI_TYPE_ #define MPI_TYPE_ MPI_REAL4 -#include +#include #ifdef OVERLOAD_C4 #undef MPP_TRANSMIT_ @@ -585,7 +585,7 @@ end subroutine mpp_exit #define MPP_TYPE_BYTELEN_ 8 #undef MPI_TYPE_ #define MPI_TYPE_ MPI_COMPLEX -#include +#include #endif #undef MPP_TYPE_INIT_VALUE @@ -644,7 +644,7 @@ end subroutine mpp_exit #define MPP_TYPE_BYTELEN_ 8 #undef MPI_TYPE_ #define MPI_TYPE_ MPI_INTEGER8 -#include +#include #undef MPP_TRANSMIT_ #define MPP_TRANSMIT_ mpp_transmit_int4 @@ -700,7 +700,7 @@ end subroutine mpp_exit #define MPP_TYPE_BYTELEN_ 4 #undef MPI_TYPE_ #define MPI_TYPE_ MPI_INTEGER4 -#include +#include #undef MPP_TYPE_INIT_VALUE #define MPP_TYPE_INIT_VALUE .false. @@ -758,7 +758,7 @@ end subroutine mpp_exit #define MPP_TYPE_BYTELEN_ 8 #undef MPI_TYPE_ #define MPI_TYPE_ MPI_INTEGER8 -#include +#include #undef MPP_TRANSMIT_ #define MPP_TRANSMIT_ mpp_transmit_logical4 @@ -814,7 +814,7 @@ end subroutine mpp_exit #define MPP_TYPE_BYTELEN_ 4 #undef MPI_TYPE_ #define MPI_TYPE_ MPI_INTEGER4 -#include +#include #undef MPP_TYPE_INIT_VALUE !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -834,7 +834,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_REAL8 #undef MPI_REDUCE_ #define MPI_REDUCE_ MPI_MAX -#include +#include #undef MPP_REDUCE_0D_ #define MPP_REDUCE_0D_ mpp_max_real4_0d @@ -848,7 +848,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_REAL4 #undef MPI_REDUCE_ #define MPI_REDUCE_ MPI_MAX -#include +#include #undef MPP_REDUCE_0D_ #define MPP_REDUCE_0D_ mpp_max_int8_0d @@ -862,7 +862,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_INTEGER8 #undef MPI_REDUCE_ #define MPI_REDUCE_ MPI_MAX -#include +#include #undef MPP_REDUCE_0D_ #define MPP_REDUCE_0D_ mpp_max_int4_0d @@ -876,7 +876,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_INTEGER4 #undef MPI_REDUCE_ #define MPI_REDUCE_ MPI_MAX -#include +#include #undef MPP_REDUCE_0D_ #define MPP_REDUCE_0D_ mpp_min_real8_0d @@ -890,7 +890,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_REAL8 #undef MPI_REDUCE_ #define MPI_REDUCE_ MPI_MIN -#include +#include #undef MPP_REDUCE_0D_ #define MPP_REDUCE_0D_ mpp_min_real4_0d @@ -904,7 +904,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_REAL4 #undef MPI_REDUCE_ #define MPI_REDUCE_ MPI_MIN -#include +#include #undef MPP_REDUCE_0D_ #define MPP_REDUCE_0D_ mpp_min_int8_0d @@ -918,7 +918,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_INTEGER8 #undef MPI_REDUCE_ #define MPI_REDUCE_ MPI_MIN -#include +#include #undef MPP_REDUCE_0D_ #define MPP_REDUCE_0D_ mpp_min_int4_0d @@ -932,7 +932,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_INTEGER4 #undef MPI_REDUCE_ #define MPI_REDUCE_ MPI_MIN -#include +#include #undef MPP_SUM_ #define MPP_SUM_ mpp_sum_real8 @@ -952,7 +952,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_REAL8 #undef MPP_TYPE_BYTELEN_ #define MPP_TYPE_BYTELEN_ 8 -#include +#include #ifdef OVERLOAD_C8 #undef MPP_SUM_ @@ -973,7 +973,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_DOUBLE_COMPLEX #undef MPP_TYPE_BYTELEN_ #define MPP_TYPE_BYTELEN_ 16 -#include +#include #endif #undef MPP_SUM_ @@ -994,7 +994,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_REAL4 #undef MPP_TYPE_BYTELEN_ #define MPP_TYPE_BYTELEN_ 4 -#include +#include #ifdef OVERLOAD_C4 #undef MPP_SUM_ @@ -1015,7 +1015,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_COMPLEX #undef MPP_TYPE_BYTELEN_ #define MPP_TYPE_BYTELEN_ 8 -#include +#include #endif #undef MPP_SUM_ @@ -1036,7 +1036,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_INTEGER8 #undef MPP_TYPE_BYTELEN_ #define MPP_TYPE_BYTELEN_ 8 -#include +#include #undef MPP_SUM_ #define MPP_SUM_ mpp_sum_int4 @@ -1056,7 +1056,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_INTEGER4 #undef MPP_TYPE_BYTELEN_ #define MPP_TYPE_BYTELEN_ 4 -#include +#include !-------------------------------- #undef MPP_SUM_AD_ #define MPP_SUM_AD_ mpp_sum_real8_ad @@ -1076,7 +1076,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_REAL8 #undef MPP_TYPE_BYTELEN_ #define MPP_TYPE_BYTELEN_ 8 -#include +#include #ifdef OVERLOAD_C8 #undef MPP_SUM_AD_ @@ -1097,7 +1097,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_DOUBLE_COMPLEX #undef MPP_TYPE_BYTELEN_ #define MPP_TYPE_BYTELEN_ 16 -#include +#include #endif #undef MPP_SUM_AD_ @@ -1118,7 +1118,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_REAL4 #undef MPP_TYPE_BYTELEN_ #define MPP_TYPE_BYTELEN_ 4 -#include +#include #ifdef OVERLOAD_C4 #undef MPP_SUM_AD_ @@ -1139,7 +1139,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_COMPLEX #undef MPP_TYPE_BYTELEN_ #define MPP_TYPE_BYTELEN_ 8 -#include +#include #endif #undef MPP_SUM_AD_ @@ -1160,7 +1160,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_INTEGER8 #undef MPP_TYPE_BYTELEN_ #define MPP_TYPE_BYTELEN_ 8 -#include +#include #undef MPP_SUM_AD_ #define MPP_SUM_AD_ mpp_sum_int4_ad @@ -1180,7 +1180,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_INTEGER4 #undef MPP_TYPE_BYTELEN_ #define MPP_TYPE_BYTELEN_ 4 -#include +#include !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! ! @@ -1200,7 +1200,7 @@ end subroutine mpp_exit #define MPP_TYPE_ integer(i4_kind) #define MPP_TYPE_BYTELEN_ 4 #define MPI_TYPE_ MPI_INTEGER4 -#include +#include #undef MPP_ALLTOALL_ #undef MPP_ALLTOALLV_ @@ -1214,7 +1214,7 @@ end subroutine mpp_exit #define MPP_TYPE_ integer(i8_kind) #define MPP_TYPE_BYTELEN_ 8 #define MPI_TYPE_ MPI_INTEGER8 -#include +#include #undef MPP_ALLTOALL_ #undef MPP_ALLTOALLV_ @@ -1228,7 +1228,7 @@ end subroutine mpp_exit #define MPP_TYPE_ real(r4_kind) #define MPP_TYPE_BYTELEN_ 4 #define MPI_TYPE_ MPI_REAL4 -#include +#include #undef MPP_ALLTOALL_ #undef MPP_ALLTOALLV_ @@ -1242,7 +1242,7 @@ end subroutine mpp_exit #define MPP_TYPE_ real(r8_kind) #define MPP_TYPE_BYTELEN_ 8 #define MPI_TYPE_ MPI_REAL8 -#include +#include #ifdef OVERLOAD_C4 #undef MPP_ALLTOALL_ @@ -1257,7 +1257,7 @@ end subroutine mpp_exit #define MPP_TYPE_ complex(c4_kind) #define MPP_TYPE_BYTELEN_ 8 #define MPI_TYPE_ MPI_COMPLEX8 -#include +#include #endif #ifdef OVERLOAD_C8 @@ -1273,7 +1273,7 @@ end subroutine mpp_exit #define MPP_TYPE_ complex(c8_kind) #define MPP_TYPE_BYTELEN_ 16 #define MPI_TYPE_ MPI_COMPLEX16 -#include +#include #endif #undef MPP_ALLTOALL_ @@ -1288,7 +1288,7 @@ end subroutine mpp_exit #define MPP_TYPE_ logical(l4_kind) #define MPP_TYPE_BYTELEN_ 4 #define MPI_TYPE_ MPI_INTEGER4 -#include +#include #undef MPP_ALLTOALL_ #undef MPP_ALLTOALLV_ @@ -1302,7 +1302,7 @@ end subroutine mpp_exit #define MPP_TYPE_ logical(l8_kind) #define MPP_TYPE_BYTELEN_ 8 #define MPI_TYPE_ MPI_INTEGER8 -#include +#include !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! ! @@ -1316,7 +1316,7 @@ end subroutine mpp_exit #define MPP_TYPE_CREATE_ mpp_type_create_int4 #define MPP_TYPE_ integer(i4_kind) #define MPI_TYPE_ MPI_INTEGER4 -#include +#include #undef MPP_TYPE_CREATE_ #undef MPP_TYPE_ @@ -1324,7 +1324,7 @@ end subroutine mpp_exit #define MPP_TYPE_CREATE_ mpp_type_create_int8 #define MPP_TYPE_ integer(i8_kind) #define MPI_TYPE_ MPI_INTEGER8 -#include +#include #undef MPP_TYPE_CREATE_ #undef MPP_TYPE_ @@ -1332,7 +1332,7 @@ end subroutine mpp_exit #define MPP_TYPE_CREATE_ mpp_type_create_real4 #define MPP_TYPE_ real(r4_kind) #define MPI_TYPE_ MPI_REAL4 -#include +#include #undef MPP_TYPE_CREATE_ #undef MPP_TYPE_ @@ -1340,7 +1340,7 @@ end subroutine mpp_exit #define MPP_TYPE_CREATE_ mpp_type_create_real8 #define MPP_TYPE_ real(r8_kind) #define MPI_TYPE_ MPI_REAL8 -#include +#include #undef MPP_TYPE_CREATE_ #undef MPP_TYPE_ @@ -1348,7 +1348,7 @@ end subroutine mpp_exit #define MPP_TYPE_CREATE_ mpp_type_create_cmplx4 #define MPP_TYPE_ complex(c4_kind) #define MPI_TYPE_ MPI_COMPLEX8 -#include +#include #undef MPP_TYPE_CREATE_ #undef MPP_TYPE_ @@ -1356,7 +1356,7 @@ end subroutine mpp_exit #define MPP_TYPE_CREATE_ mpp_type_create_cmplx8 #define MPP_TYPE_ complex(c8_kind) #define MPI_TYPE_ MPI_COMPLEX16 -#include +#include #undef MPP_TYPE_CREATE_ #undef MPP_TYPE_ @@ -1364,7 +1364,7 @@ end subroutine mpp_exit #define MPP_TYPE_CREATE_ mpp_type_create_logical4 #define MPP_TYPE_ logical(l4_kind) #define MPI_TYPE_ MPI_INTEGER4 -#include +#include #undef MPP_TYPE_CREATE_ #undef MPP_TYPE_ @@ -1372,7 +1372,7 @@ end subroutine mpp_exit #define MPP_TYPE_CREATE_ mpp_type_create_logical8 #define MPP_TYPE_ logical(l8_kind) #define MPI_TYPE_ MPI_INTEGER8 -#include +#include ! Clear preprocessor flags #undef MPI_TYPE_ diff --git a/mpp/include/mpp_comm_nocomm.inc b/mpp/include/mpp_comm_nocomm.inc index efe25205e3..a1d849b831 100644 --- a/mpp/include/mpp_comm_nocomm.inc +++ b/mpp/include/mpp_comm_nocomm.inc @@ -317,7 +317,7 @@ end subroutine mpp_exit #define MPP_TYPE_BYTELEN_ 8 #undef MPI_TYPE_ #define MPI_TYPE_ MPI_REAL8 -#include +#include #ifdef OVERLOAD_C8 #undef MPP_TRANSMIT_ @@ -374,7 +374,7 @@ end subroutine mpp_exit #define MPP_TYPE_BYTELEN_ 16 #undef MPI_TYPE_ #define MPI_TYPE_ MPI_DOUBLE_COMPLEX -#include +#include #endif #undef MPP_TRANSMIT_ @@ -431,7 +431,7 @@ end subroutine mpp_exit #define MPP_TYPE_BYTELEN_ 4 #undef MPI_TYPE_ #define MPI_TYPE_ MPI_REAL4 -#include +#include #ifdef OVERLOAD_C4 #undef MPP_TRANSMIT_ @@ -488,7 +488,7 @@ end subroutine mpp_exit #define MPP_TYPE_BYTELEN_ 8 #undef MPI_TYPE_ #define MPI_TYPE_ MPI_COMPLEX -#include +#include #endif #undef MPP_TYPE_INIT_VALUE @@ -547,7 +547,7 @@ end subroutine mpp_exit #define MPP_TYPE_BYTELEN_ 8 #undef MPI_TYPE_ #define MPI_TYPE_ MPI_INTEGER8 -#include +#include #undef MPP_TRANSMIT_ #define MPP_TRANSMIT_ mpp_transmit_int4 @@ -603,7 +603,7 @@ end subroutine mpp_exit #define MPP_TYPE_BYTELEN_ 4 #undef MPI_TYPE_ #define MPI_TYPE_ MPI_INTEGER4 -#include +#include #undef MPP_TYPE_INIT_VALUE #define MPP_TYPE_INIT_VALUE .false. @@ -661,7 +661,7 @@ end subroutine mpp_exit #define MPP_TYPE_BYTELEN_ 8 #undef MPI_TYPE_ #define MPI_TYPE_ MPI_INTEGER8 -#include +#include #undef MPP_TRANSMIT_ #define MPP_TRANSMIT_ mpp_transmit_logical4 @@ -717,7 +717,7 @@ end subroutine mpp_exit #define MPP_TYPE_BYTELEN_ 4 #undef MPI_TYPE_ #define MPI_TYPE_ MPI_INTEGER4 -#include +#include #undef MPP_TYPE_INIT_VALUE !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -737,7 +737,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_REAL8 #undef MPI_REDUCE_ #define MPI_REDUCE_ MPI_MAX -#include +#include #undef MPP_REDUCE_0D_ #define MPP_REDUCE_0D_ mpp_max_real4_0d @@ -751,7 +751,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_REAL4 #undef MPI_REDUCE_ #define MPI_REDUCE_ MPI_MAX -#include +#include #undef MPP_REDUCE_0D_ #define MPP_REDUCE_0D_ mpp_max_int8_0d @@ -765,7 +765,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_INTEGER8 #undef MPI_REDUCE_ #define MPI_REDUCE_ MPI_MAX -#include +#include #undef MPP_REDUCE_0D_ #define MPP_REDUCE_0D_ mpp_max_int4_0d @@ -779,7 +779,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_INTEGER4 #undef MPI_REDUCE_ #define MPI_REDUCE_ MPI_MAX -#include +#include #undef MPP_REDUCE_0D_ #define MPP_REDUCE_0D_ mpp_min_real8_0d @@ -793,7 +793,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_REAL8 #undef MPI_REDUCE_ #define MPI_REDUCE_ MPI_MIN -#include +#include #undef MPP_REDUCE_0D_ #define MPP_REDUCE_0D_ mpp_min_real4_0d @@ -807,7 +807,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_REAL4 #undef MPI_REDUCE_ #define MPI_REDUCE_ MPI_MIN -#include +#include #undef MPP_REDUCE_0D_ #define MPP_REDUCE_0D_ mpp_min_int8_0d @@ -821,7 +821,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_INTEGER8 #undef MPI_REDUCE_ #define MPI_REDUCE_ MPI_MIN -#include +#include #undef MPP_REDUCE_0D_ #define MPP_REDUCE_0D_ mpp_min_int4_0d @@ -835,7 +835,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_INTEGER4 #undef MPI_REDUCE_ #define MPI_REDUCE_ MPI_MIN -#include +#include #undef MPP_SUM_ #define MPP_SUM_ mpp_sum_real8 @@ -855,7 +855,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_REAL8 #undef MPP_TYPE_BYTELEN_ #define MPP_TYPE_BYTELEN_ 8 -#include +#include #ifdef OVERLOAD_C8 #undef MPP_SUM_ @@ -876,7 +876,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_DOUBLE_COMPLEX #undef MPP_TYPE_BYTELEN_ #define MPP_TYPE_BYTELEN_ 16 -#include +#include #endif #undef MPP_SUM_ @@ -897,7 +897,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_REAL4 #undef MPP_TYPE_BYTELEN_ #define MPP_TYPE_BYTELEN_ 4 -#include +#include #ifdef OVERLOAD_C4 #undef MPP_SUM_ @@ -918,7 +918,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_COMPLEX #undef MPP_TYPE_BYTELEN_ #define MPP_TYPE_BYTELEN_ 8 -#include +#include #endif #undef MPP_SUM_ @@ -939,7 +939,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_INTEGER8 #undef MPP_TYPE_BYTELEN_ #define MPP_TYPE_BYTELEN_ 8 -#include +#include #undef MPP_SUM_ #define MPP_SUM_ mpp_sum_int4 @@ -959,7 +959,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_INTEGER4 #undef MPP_TYPE_BYTELEN_ #define MPP_TYPE_BYTELEN_ 4 -#include +#include !-------------------------------- #undef MPP_SUM_AD_ #define MPP_SUM_AD_ mpp_sum_real8_ad @@ -979,7 +979,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_REAL8 #undef MPP_TYPE_BYTELEN_ #define MPP_TYPE_BYTELEN_ 8 -#include +#include #ifdef OVERLOAD_C8 #undef MPP_SUM_AD_ @@ -1000,7 +1000,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_DOUBLE_COMPLEX #undef MPP_TYPE_BYTELEN_ #define MPP_TYPE_BYTELEN_ 16 -#include +#include #endif #undef MPP_SUM_AD_ @@ -1021,7 +1021,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_REAL4 #undef MPP_TYPE_BYTELEN_ #define MPP_TYPE_BYTELEN_ 4 -#include +#include #ifdef OVERLOAD_C4 #undef MPP_SUM_AD_ @@ -1042,7 +1042,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_COMPLEX #undef MPP_TYPE_BYTELEN_ #define MPP_TYPE_BYTELEN_ 8 -#include +#include #endif #undef MPP_SUM_AD_ @@ -1063,7 +1063,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_INTEGER8 #undef MPP_TYPE_BYTELEN_ #define MPP_TYPE_BYTELEN_ 8 -#include +#include #undef MPP_SUM_AD_ #define MPP_SUM_AD_ mpp_sum_int4_ad @@ -1083,7 +1083,7 @@ end subroutine mpp_exit #define MPI_TYPE_ MPI_INTEGER4 #undef MPP_TYPE_BYTELEN_ #define MPP_TYPE_BYTELEN_ 4 -#include +#include !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! ! @@ -1103,7 +1103,7 @@ end subroutine mpp_exit #define MPP_TYPE_ integer(i4_kind) #define MPP_TYPE_BYTELEN_ 4 #define MPI_TYPE_ MPI_INTEGER4 -#include +#include #undef MPP_ALLTOALL_ #undef MPP_ALLTOALLV_ @@ -1117,7 +1117,7 @@ end subroutine mpp_exit #define MPP_TYPE_ integer(i8_kind) #define MPP_TYPE_BYTELEN_ 8 #define MPI_TYPE_ MPI_INTEGER8 -#include +#include #undef MPP_ALLTOALL_ #undef MPP_ALLTOALLV_ @@ -1131,7 +1131,7 @@ end subroutine mpp_exit #define MPP_TYPE_ real(r4_kind) #define MPP_TYPE_BYTELEN_ 4 #define MPI_TYPE_ MPI_REAL4 -#include +#include #undef MPP_ALLTOALL_ #undef MPP_ALLTOALLV_ @@ -1145,7 +1145,7 @@ end subroutine mpp_exit #define MPP_TYPE_ real(r8_kind) #define MPP_TYPE_BYTELEN_ 8 #define MPI_TYPE_ MPI_REAL8 -#include +#include #undef MPP_ALLTOALL_ #undef MPP_ALLTOALLV_ @@ -1159,7 +1159,7 @@ end subroutine mpp_exit #define MPP_TYPE_ logical(l4_kind) #define MPP_TYPE_BYTELEN_ 4 #define MPI_TYPE_ MPI_INTEGER4 -#include +#include #undef MPP_ALLTOALL_ #undef MPP_ALLTOALLV_ @@ -1173,7 +1173,7 @@ end subroutine mpp_exit #define MPP_TYPE_ logical(l8_kind) #define MPP_TYPE_BYTELEN_ 8 #define MPI_TYPE_ MPI_INTEGER8 -#include +#include !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! ! ! DATA TRANSFER TYPES: mpp_type_create, mpp_type_free ! @@ -1183,42 +1183,42 @@ end subroutine mpp_exit #define MPP_TYPE_CREATE_ mpp_type_create_int4 #define MPP_TYPE_ integer(i4_kind) #define MPI_TYPE_ MPI_INTEGER4 -#include +#include #define MPP_TYPE_CREATE_ mpp_type_create_int8 #define MPP_TYPE_ integer(i8_kind) #define MPI_TYPE_ MPI_INTEGER8 -#include +#include #define MPP_TYPE_CREATE_ mpp_type_create_real4 #define MPP_TYPE_ real(r4_kind) #define MPI_TYPE_ MPI_REAL4 -#include +#include #define MPP_TYPE_CREATE_ mpp_type_create_real8 #define MPP_TYPE_ real(r8_kind) #define MPI_TYPE_ MPI_REAL8 -#include +#include #define MPP_TYPE_CREATE_ mpp_type_create_cmplx4 #define MPP_TYPE_ complex(c4_kind) #define MPI_TYPE_ MPI_COMPLEX8 -#include +#include #define MPP_TYPE_CREATE_ mpp_type_create_cmplx8 #define MPP_TYPE_ complex(c8_kind) #define MPI_TYPE_ MPI_COMPLEX16 -#include +#include #define MPP_TYPE_CREATE_ mpp_type_create_logical4 #define MPP_TYPE_ logical(l4_kind) #define MPI_TYPE_ MPI_INTEGER4 -#include +#include #define MPP_TYPE_CREATE_ mpp_type_create_logical8 #define MPP_TYPE_ logical(l8_kind) #define MPI_TYPE_ MPI_INTEGER8 -#include +#include ! Clear preprocessor flags #undef MPI_TYPE_ diff --git a/mpp/include/mpp_do_check.h b/mpp/include/mpp_do_check.fh similarity index 100% rename from mpp/include/mpp_do_check.h rename to mpp/include/mpp_do_check.fh diff --git a/mpp/include/mpp_do_checkV.h b/mpp/include/mpp_do_checkV.fh similarity index 100% rename from mpp/include/mpp_do_checkV.h rename to mpp/include/mpp_do_checkV.fh diff --git a/mpp/include/mpp_do_get_boundary.h b/mpp/include/mpp_do_get_boundary.fh similarity index 100% rename from mpp/include/mpp_do_get_boundary.h rename to mpp/include/mpp_do_get_boundary.fh diff --git a/mpp/include/mpp_do_get_boundary_ad.h b/mpp/include/mpp_do_get_boundary_ad.fh similarity index 100% rename from mpp/include/mpp_do_get_boundary_ad.h rename to mpp/include/mpp_do_get_boundary_ad.fh diff --git a/mpp/include/mpp_do_global_field.h b/mpp/include/mpp_do_global_field.fh similarity index 100% rename from mpp/include/mpp_do_global_field.h rename to mpp/include/mpp_do_global_field.fh diff --git a/mpp/include/mpp_do_global_field_ad.h b/mpp/include/mpp_do_global_field_ad.fh similarity index 96% rename from mpp/include/mpp_do_global_field_ad.h rename to mpp/include/mpp_do_global_field_ad.fh index 235ef1cf3b..5c72b5adbf 100644 --- a/mpp/include/mpp_do_global_field_ad.h +++ b/mpp/include/mpp_do_global_field_ad.fh @@ -87,13 +87,13 @@ if(size(global,1).NE.(domain%x(tile)%global%size+ishift) .OR. & size(global,2).NE.(domain%y(tile)%compute%size+jshift)) & call mpp_error( FATAL, & - & 'MPP_GLOBAL_FIELD: incoming arrays do not match domain for xonly global field.' ) + & 'MPP_GLOBAL_FIELD: incoming arrays do not match domain for xonly global field.' ) jpos = -domain%y(tile)%compute%begin + 1 else if(yonly) then if(size(global,1).NE.(domain%x(tile)%compute%size+ishift) .OR. & size(global,2).NE.(domain%y(tile)%global%size+jshift)) & call mpp_error( FATAL, & - & 'MPP_GLOBAL_FIELD: incoming arrays do not match domain for yonly global field.' ) + & 'MPP_GLOBAL_FIELD: incoming arrays do not match domain for yonly global field.' ) ipos = -domain%x(tile)%compute%begin + 1 else call mpp_error( FATAL, 'MPP_GLOBAL_FIELD: incoming arrays do not match domain.' ) @@ -113,7 +113,7 @@ joff = -domain%y(tile)%data%begin + 1 else call mpp_error( FATAL, & - & 'MPP_GLOBAL_FIELD_: incoming field array must match either compute domain or memory domain.') + & 'MPP_GLOBAL_FIELD_: incoming field array must match either compute domain or memory domain.') end if ke = size(local,3) @@ -142,7 +142,8 @@ rpos = mod(domain%x(1)%pos +n,nd) from_pe = domain%x(1)%list(rpos)%pe rpos = from_pe - root_pe ! for concurrent run, root_pe may not be 0. - num_words = (domain%list(rpos)%x(1)%compute%size+ishift) * (domain%list(rpos)%y(1)%compute%size+jshift) * ke + num_words = (domain%list(rpos)%x(1)%compute%size+ishift) * & + (domain%list(rpos)%y(1)%compute%size+jshift) * ke ! Force use of scalar, integer ptr interface m = 0 is = domain%list(rpos)%x(1)%compute%begin; ie = domain%list(rpos)%x(1)%compute%end+ishift diff --git a/mpp/include/mpp_do_redistribute.h b/mpp/include/mpp_do_redistribute.fh similarity index 100% rename from mpp/include/mpp_do_redistribute.h rename to mpp/include/mpp_do_redistribute.fh diff --git a/mpp/include/mpp_do_update.h b/mpp/include/mpp_do_update.fh similarity index 100% rename from mpp/include/mpp_do_update.h rename to mpp/include/mpp_do_update.fh diff --git a/mpp/include/mpp_do_updateV.h b/mpp/include/mpp_do_updateV.fh similarity index 100% rename from mpp/include/mpp_do_updateV.h rename to mpp/include/mpp_do_updateV.fh diff --git a/mpp/include/mpp_do_updateV_ad.h b/mpp/include/mpp_do_updateV_ad.fh similarity index 100% rename from mpp/include/mpp_do_updateV_ad.h rename to mpp/include/mpp_do_updateV_ad.fh diff --git a/mpp/include/mpp_do_updateV_nonblock.h b/mpp/include/mpp_do_updateV_nonblock.fh similarity index 100% rename from mpp/include/mpp_do_updateV_nonblock.h rename to mpp/include/mpp_do_updateV_nonblock.fh diff --git a/mpp/include/mpp_do_update_ad.h b/mpp/include/mpp_do_update_ad.fh similarity index 100% rename from mpp/include/mpp_do_update_ad.h rename to mpp/include/mpp_do_update_ad.fh diff --git a/mpp/include/mpp_do_update_nest.h b/mpp/include/mpp_do_update_nest.fh similarity index 100% rename from mpp/include/mpp_do_update_nest.h rename to mpp/include/mpp_do_update_nest.fh diff --git a/mpp/include/mpp_do_update_nonblock.h b/mpp/include/mpp_do_update_nonblock.fh similarity index 100% rename from mpp/include/mpp_do_update_nonblock.h rename to mpp/include/mpp_do_update_nonblock.fh diff --git a/mpp/include/mpp_domains_misc.inc b/mpp/include/mpp_domains_misc.inc index a6b833e3c5..683ffd18a2 100644 --- a/mpp/include/mpp_domains_misc.inc +++ b/mpp/include/mpp_domains_misc.inc @@ -993,7 +993,7 @@ end subroutine init_nonblock_type #define MPP_REDISTRIBUTE_4D_ mpp_redistribute_r8_4D #undef MPP_REDISTRIBUTE_5D_ #define MPP_REDISTRIBUTE_5D_ mpp_redistribute_r8_5D -#include +#include #undef VECTOR_FIELD_ #ifdef OVERLOAD_C8 @@ -1015,7 +1015,7 @@ end subroutine init_nonblock_type #define MPP_REDISTRIBUTE_4D_ mpp_redistribute_c8_4D #undef MPP_REDISTRIBUTE_5D_ #define MPP_REDISTRIBUTE_5D_ mpp_redistribute_c8_5D -#include +#include #endif #undef MPP_TYPE_ @@ -1036,7 +1036,7 @@ end subroutine init_nonblock_type #define MPP_REDISTRIBUTE_4D_ mpp_redistribute_i8_4D #undef MPP_REDISTRIBUTE_5D_ #define MPP_REDISTRIBUTE_5D_ mpp_redistribute_i8_5D -#include +#include #undef VECTOR_FIELD_ #define VECTOR_FIELD_ @@ -1067,7 +1067,7 @@ end subroutine init_nonblock_type #define MPP_REDISTRIBUTE_4D_ mpp_redistribute_r4_4D #undef MPP_REDISTRIBUTE_5D_ #define MPP_REDISTRIBUTE_5D_ mpp_redistribute_r4_5D -#include +#include #undef VECTOR_FIELD_ #endif @@ -1090,7 +1090,7 @@ end subroutine init_nonblock_type #define MPP_REDISTRIBUTE_4D_ mpp_redistribute_c4_4D #undef MPP_REDISTRIBUTE_5D_ #define MPP_REDISTRIBUTE_5D_ mpp_redistribute_c4_5D -#include +#include #endif #undef MPP_TYPE_ @@ -1111,7 +1111,7 @@ end subroutine init_nonblock_type #define MPP_REDISTRIBUTE_4D_ mpp_redistribute_i4_4D #undef MPP_REDISTRIBUTE_5D_ #define MPP_REDISTRIBUTE_5D_ mpp_redistribute_i4_5D -#include +#include !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -1159,7 +1159,7 @@ end subroutine init_nonblock_type #undef MPP_COMPLETE_UPDATE_DOMAINS_5D_V_ #define MPP_COMPLETE_UPDATE_DOMAINS_5D_V_ mpp_complete_update_domain2D_r8_5Dv #endif -#include +#include #ifdef OVERLOAD_C8 #undef VECTOR_FIELD_ @@ -1181,7 +1181,7 @@ end subroutine init_nonblock_type #define MPP_COMPLETE_UPDATE_DOMAINS_4D_ mpp_complete_update_domain2D_c8_4D #undef MPP_COMPLETE_UPDATE_DOMAINS_5D_ #define MPP_COMPLETE_UPDATE_DOMAINS_5D_ mpp_complete_update_domain2D_c8_5D -#include +#include #endif #undef VECTOR_FIELD_ @@ -1203,7 +1203,7 @@ end subroutine init_nonblock_type #define MPP_COMPLETE_UPDATE_DOMAINS_4D_ mpp_complete_update_domain2D_i8_4D #undef MPP_COMPLETE_UPDATE_DOMAINS_5D_ #define MPP_COMPLETE_UPDATE_DOMAINS_5D_ mpp_complete_update_domain2D_i8_5D -#include +#include #undef VECTOR_FIELD_ #define VECTOR_FIELD_ @@ -1243,7 +1243,7 @@ end subroutine init_nonblock_type #undef MPP_COMPLETE_UPDATE_DOMAINS_5D_V_ #define MPP_COMPLETE_UPDATE_DOMAINS_5D_V_ mpp_complete_update_domain2D_r4_5Dv #endif -#include +#include #ifdef OVERLOAD_C4 #undef VECTOR_FIELD_ @@ -1265,7 +1265,7 @@ end subroutine init_nonblock_type #define MPP_COMPLETE_UPDATE_DOMAINS_4D_ mpp_complete_update_domain2D_c4_4D #undef MPP_COMPLETE_UPDATE_DOMAINS_5D_ #define MPP_COMPLETE_UPDATE_DOMAINS_5D_ mpp_complete_update_domain2D_c4_5D -#include +#include #endif #undef VECTOR_FIELD_ @@ -1287,7 +1287,7 @@ end subroutine init_nonblock_type #define MPP_COMPLETE_UPDATE_DOMAINS_4D_ mpp_complete_update_domain2D_i4_4D #undef MPP_COMPLETE_UPDATE_DOMAINS_5D_ #define MPP_COMPLETE_UPDATE_DOMAINS_5D_ mpp_complete_update_domain2D_i4_5D -#include +#include !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! ! @@ -1308,8 +1308,8 @@ end subroutine init_nonblock_type #define MPP_START_DO_UPDATE_3D_V_ mpp_start_do_update_r8_3Dv #undef MPP_COMPLETE_DO_UPDATE_3D_V_ #define MPP_COMPLETE_DO_UPDATE_3D_V_ mpp_complete_do_update_r8_3Dv -#include -#include +#include +#include #ifdef OVERLOAD_C8 #undef MPP_TYPE_ @@ -1320,7 +1320,7 @@ end subroutine init_nonblock_type #define MPP_START_DO_UPDATE_3D_ mpp_start_do_update_c8_3D #undef MPP_COMPLETE_DO_UPDATE_3D_ #define MPP_COMPLETE_DO_UPDATE_3D_ mpp_complete_do_update_c8_3D -#include +#include #endif #undef MPP_TYPE_ @@ -1331,7 +1331,7 @@ end subroutine init_nonblock_type #define MPP_START_DO_UPDATE_3D_ mpp_start_do_update_i8_3D #undef MPP_COMPLETE_DO_UPDATE_3D_ #define MPP_COMPLETE_DO_UPDATE_3D_ mpp_complete_do_update_i8_3D -#include +#include #undef MPP_TYPE_ #define MPP_TYPE_ real(r4_kind) @@ -1345,8 +1345,8 @@ end subroutine init_nonblock_type #define MPP_START_DO_UPDATE_3D_V_ mpp_start_do_update_r4_3Dv #undef MPP_COMPLETE_DO_UPDATE_3D_V_ #define MPP_COMPLETE_DO_UPDATE_3D_V_ mpp_complete_do_update_r4_3Dv -#include -#include +#include +#include #ifdef OVERLOAD_C4 #undef MPP_TYPE_ @@ -1357,7 +1357,7 @@ end subroutine init_nonblock_type #define MPP_START_DO_UPDATE_3D_ mpp_start_do_update_c4_3D #undef MPP_COMPLETE_DO_UPDATE_3D_ #define MPP_COMPLETE_DO_UPDATE_3D_ mpp_complete_do_update_c4_3D -#include +#include #endif #undef MPP_TYPE_ @@ -1368,7 +1368,7 @@ end subroutine init_nonblock_type #define MPP_START_DO_UPDATE_3D_ mpp_start_do_update_i4_3D #undef MPP_COMPLETE_DO_UPDATE_3D_ #define MPP_COMPLETE_DO_UPDATE_3D_ mpp_complete_do_update_i4_3D -#include +#include !******************************************************* #undef VECTOR_FIELD_ @@ -1381,8 +1381,8 @@ end subroutine init_nonblock_type #undef MPP_DO_UPDATE_3D_V_ #define MPP_DO_UPDATE_3D_V_ mpp_do_update_r8_3dv #endif -#include -#include +#include +#include #ifdef OVERLOAD_C8 #undef VECTOR_FIELD_ @@ -1390,7 +1390,7 @@ end subroutine init_nonblock_type #define MPP_TYPE_ complex(c8_kind) #undef MPP_DO_UPDATE_3D_ #define MPP_DO_UPDATE_3D_ mpp_do_update_c8_3d -#include +#include #define VECTOR_FIELD_ #endif @@ -1398,7 +1398,7 @@ end subroutine init_nonblock_type #define MPP_TYPE_ integer(i8_kind) #undef MPP_DO_UPDATE_3D_ #define MPP_DO_UPDATE_3D_ mpp_do_update_i8_3d -#include +#include #undef VECTOR_FIELD_ #define VECTOR_FIELD_ @@ -1410,8 +1410,8 @@ end subroutine init_nonblock_type #undef MPP_DO_UPDATE_3D_V_ #define MPP_DO_UPDATE_3D_V_ mpp_do_update_r4_3dv #endif -#include -#include +#include +#include #ifdef OVERLOAD_C4 #undef VECTOR_FIELD_ @@ -1419,7 +1419,7 @@ end subroutine init_nonblock_type #define MPP_TYPE_ complex(c4_kind) #undef MPP_DO_UPDATE_3D_ #define MPP_DO_UPDATE_3D_ mpp_do_update_c4_3d -#include +#include #define VECTOR_FIELD_ #endif @@ -1427,7 +1427,7 @@ end subroutine init_nonblock_type #define MPP_TYPE_ integer(i4_kind) #undef MPP_DO_UPDATE_3D_ #define MPP_DO_UPDATE_3D_ mpp_do_update_i4_3d -#include +#include #undef MPP_TYPE_ @@ -1438,8 +1438,8 @@ end subroutine init_nonblock_type #undef MPP_DO_CHECK_3D_V_ #define MPP_DO_CHECK_3D_V_ mpp_do_check_r8_3dv #endif -#include -#include +#include +#include #ifdef OVERLOAD_C8 #undef VECTOR_FIELD_ @@ -1447,7 +1447,7 @@ end subroutine init_nonblock_type #define MPP_TYPE_ complex(c8_kind) #undef MPP_DO_CHECK_3D_ #define MPP_DO_CHECK_3D_ mpp_do_check_c8_3d -#include +#include #define VECTOR_FIELD_ #endif @@ -1455,7 +1455,7 @@ end subroutine init_nonblock_type #define MPP_TYPE_ integer(i8_kind) #undef MPP_DO_CHECK_3D_ #define MPP_DO_CHECK_3D_ mpp_do_check_i8_3d -#include +#include #undef VECTOR_FIELD_ #define VECTOR_FIELD_ @@ -1467,8 +1467,8 @@ end subroutine init_nonblock_type #undef MPP_DO_CHECK_3D_V_ #define MPP_DO_CHECK_3D_V_ mpp_do_check_r4_3dv #endif -#include -#include +#include +#include #ifdef OVERLOAD_C4 #undef VECTOR_FIELD_ @@ -1476,14 +1476,14 @@ end subroutine init_nonblock_type #define MPP_TYPE_ complex(c4_kind) #undef MPP_DO_CHECK_3D_ #define MPP_DO_CHECK_3D_ mpp_do_check_c4_3d -#include +#include #endif #undef MPP_TYPE_ #define MPP_TYPE_ integer(i4_kind) #undef MPP_DO_CHECK_3D_ #define MPP_DO_CHECK_3D_ mpp_do_check_i4_3d -#include +#include #undef VECTOR_FIELD_ #define VECTOR_FIELD_ @@ -1513,7 +1513,7 @@ end subroutine init_nonblock_type #define MPP_UPDATE_NEST_COARSE_3D_V_ mpp_update_nest_coarse_r8_3Dv #undef MPP_UPDATE_NEST_COARSE_4D_V_ #define MPP_UPDATE_NEST_COARSE_4D_V_ mpp_update_nest_coarse_r8_4Dv -#include +#include #ifdef OVERLOAD_C8 #undef VECTOR_FIELD_ @@ -1531,7 +1531,7 @@ end subroutine init_nonblock_type #define MPP_UPDATE_NEST_COARSE_3D_ mpp_update_nest_coarse_c8_3D #undef MPP_UPDATE_NEST_COARSE_4D_ #define MPP_UPDATE_NEST_COARSE_4D_ mpp_update_nest_coarse_c8_4D -#include +#include #endif #undef VECTOR_FIELD_ @@ -1549,7 +1549,7 @@ end subroutine init_nonblock_type #define MPP_UPDATE_NEST_COARSE_3D_ mpp_update_nest_coarse_i8_3D #undef MPP_UPDATE_NEST_COARSE_4D_ #define MPP_UPDATE_NEST_COARSE_4D_ mpp_update_nest_coarse_i8_4D -#include +#include #undef VECTOR_FIELD_ #define VECTOR_FIELD_ @@ -1579,7 +1579,7 @@ end subroutine init_nonblock_type #define MPP_UPDATE_NEST_COARSE_3D_V_ mpp_update_nest_coarse_r4_3Dv #undef MPP_UPDATE_NEST_COARSE_4D_V_ #define MPP_UPDATE_NEST_COARSE_4D_V_ mpp_update_nest_coarse_r4_4Dv -#include +#include #ifdef OVERLOAD_C4 #undef VECTOR_FIELD_ @@ -1597,7 +1597,7 @@ end subroutine init_nonblock_type #define MPP_UPDATE_NEST_COARSE_3D_ mpp_update_nest_coarse_c4_3D #undef MPP_UPDATE_NEST_COARSE_4D_ #define MPP_UPDATE_NEST_COARSE_4D_ mpp_update_nest_coarse_c4_4D -#include +#include #endif #undef VECTOR_FIELD_ @@ -1615,7 +1615,7 @@ end subroutine init_nonblock_type #define MPP_UPDATE_NEST_COARSE_3D_ mpp_update_nest_coarse_i4_3D #undef MPP_UPDATE_NEST_COARSE_4D_ #define MPP_UPDATE_NEST_COARSE_4D_ mpp_update_nest_coarse_i4_4D -#include +#include #undef VECTOR_FIELD_ #define VECTOR_FIELD_ @@ -1629,7 +1629,7 @@ end subroutine init_nonblock_type #define MPP_DO_UPDATE_NEST_COARSE_3D_ mpp_do_update_nest_coarse_r8_3D #undef MPP_DO_UPDATE_NEST_COARSE_3D_V_ #define MPP_DO_UPDATE_NEST_COARSE_3D_V_ mpp_do_update_nest_coarse_r8_3Dv -#include +#include #ifdef OVERLOAD_C8 #undef VECTOR_FIELD_ @@ -1639,7 +1639,7 @@ end subroutine init_nonblock_type #define MPP_DO_UPDATE_NEST_FINE_3D_ mpp_do_update_nest_fine_c8_3D #undef MPP_DO_UPDATE_NEST_COARSE_3D_ #define MPP_DO_UPDATE_NEST_COARSE_3D_ mpp_do_update_nest_coarse_c8_3D -#include +#include #endif #undef VECTOR_FIELD_ @@ -1649,7 +1649,7 @@ end subroutine init_nonblock_type #define MPP_DO_UPDATE_NEST_FINE_3D_ mpp_do_update_nest_fine_i8_3D #undef MPP_DO_UPDATE_NEST_COARSE_3D_ #define MPP_DO_UPDATE_NEST_COARSE_3D_ mpp_do_update_nest_coarse_i8_3D -#include +#include #undef VECTOR_FIELD_ #define VECTOR_FIELD_ @@ -1663,7 +1663,7 @@ end subroutine init_nonblock_type #define MPP_DO_UPDATE_NEST_COARSE_3D_ mpp_do_update_nest_coarse_r4_3D #undef MPP_DO_UPDATE_NEST_COARSE_3D_V_ #define MPP_DO_UPDATE_NEST_COARSE_3D_V_ mpp_do_update_nest_coarse_r4_3Dv -#include +#include #ifdef OVERLOAD_C4 #undef VECTOR_FIELD_ @@ -1673,7 +1673,7 @@ end subroutine init_nonblock_type #define MPP_DO_UPDATE_NEST_FINE_3D_ mpp_do_update_nest_fine_c4_3D #undef MPP_DO_UPDATE_NEST_COARSE_3D_ #define MPP_DO_UPDATE_NEST_COARSE_3D_ mpp_do_update_nest_coarse_c4_3D -#include +#include #endif #undef VECTOR_FIELD_ @@ -1683,7 +1683,7 @@ end subroutine init_nonblock_type #define MPP_DO_UPDATE_NEST_FINE_3D_ mpp_do_update_nest_fine_i4_3D #undef MPP_DO_UPDATE_NEST_COARSE_3D_ #define MPP_DO_UPDATE_NEST_COARSE_3D_ mpp_do_update_nest_coarse_i4_3D -#include +#include !bnc !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -1713,7 +1713,7 @@ end subroutine init_nonblock_type #undef MPP_UPDATE_DOMAINS_AD_5D_V_ #define MPP_UPDATE_DOMAINS_AD_5D_V_ mpp_update_domains_ad_2D_r8_5Dv #endif -#include +#include #undef VECTOR_FIELD_ #define VECTOR_FIELD_ @@ -1737,7 +1737,7 @@ end subroutine init_nonblock_type #undef MPP_UPDATE_DOMAINS_AD_5D_V_ #define MPP_UPDATE_DOMAINS_AD_5D_V_ mpp_update_domains_ad_2D_r4_5Dv #endif -#include +#include !******************************************************* #undef VECTOR_FIELD_ @@ -1750,8 +1750,8 @@ end subroutine init_nonblock_type #undef MPP_DO_UPDATE_AD_3D_V_ #define MPP_DO_UPDATE_AD_3D_V_ mpp_do_update_ad_r8_3dv #endif -#include -#include +#include +#include #ifdef OVERLOAD_C8 #undef VECTOR_FIELD_ @@ -1759,7 +1759,7 @@ end subroutine init_nonblock_type #define MPP_TYPE_ complex(c8_kind) #undef MPP_DO_UPDATE_AD_3D_ #define MPP_DO_UPDATE_AD_3D_ mpp_do_update_ad_c8_3d -#include +#include #define VECTOR_FIELD_ #endif @@ -1767,7 +1767,7 @@ end subroutine init_nonblock_type #define MPP_TYPE_ integer(i8_kind) #undef MPP_DO_UPDATE_AD_3D_ #define MPP_DO_UPDATE_AD_3D_ mpp_do_update_ad_i8_3d -#include +#include #undef VECTOR_FIELD_ #define VECTOR_FIELD_ @@ -1779,8 +1779,8 @@ end subroutine init_nonblock_type #undef MPP_DO_UPDATE_AD_3D_V_ #define MPP_DO_UPDATE_AD_3D_V_ mpp_do_update_ad_r4_3dv #endif -#include -#include +#include +#include #ifdef OVERLOAD_C4 #undef VECTOR_FIELD_ @@ -1788,7 +1788,7 @@ end subroutine init_nonblock_type #define MPP_TYPE_ complex(c4_kind) #undef MPP_DO_UPDATE_AD_3D_ #define MPP_DO_UPDATE_AD_3D_ mpp_do_update_ad_c4_3d -#include +#include #define VECTOR_FIELD_ #endif @@ -1796,14 +1796,14 @@ end subroutine init_nonblock_type #define MPP_TYPE_ integer(i4_kind) #undef MPP_DO_UPDATE_AD_3D_ #define MPP_DO_UPDATE_AD_3D_ mpp_do_update_ad_i4_3d -#include +#include !******************************************************** #undef MPP_TYPE_ #define MPP_TYPE_ real(r8_kind) #undef MPP_DO_REDISTRIBUTE_3D_ #define MPP_DO_REDISTRIBUTE_3D_ mpp_do_redistribute_r8_3D -#include +#include #undef VECTOR_FIELD_ #ifdef OVERLOAD_C8 @@ -1811,26 +1811,26 @@ end subroutine init_nonblock_type #define MPP_TYPE_ complex(c8_kind) #undef MPP_DO_REDISTRIBUTE_3D_ #define MPP_DO_REDISTRIBUTE_3D_ mpp_do_redistribute_c8_3D -#include +#include #endif #undef MPP_TYPE_ #define MPP_TYPE_ integer(i8_kind) #undef MPP_DO_REDISTRIBUTE_3D_ #define MPP_DO_REDISTRIBUTE_3D_ mpp_do_redistribute_i8_3D -#include +#include #undef MPP_TYPE_ #define MPP_TYPE_ logical(l8_kind) #undef MPP_DO_REDISTRIBUTE_3D_ #define MPP_DO_REDISTRIBUTE_3D_ mpp_do_redistribute_l8_3D -#include +#include #undef MPP_TYPE_ #define MPP_TYPE_ real(r4_kind) #undef MPP_DO_REDISTRIBUTE_3D_ #define MPP_DO_REDISTRIBUTE_3D_ mpp_do_redistribute_r4_3D -#include +#include #undef VECTOR_FIELD_ #ifdef OVERLOAD_C4 @@ -1838,20 +1838,20 @@ end subroutine init_nonblock_type #define MPP_TYPE_ complex(c4_kind) #undef MPP_DO_REDISTRIBUTE_3D_ #define MPP_DO_REDISTRIBUTE_3D_ mpp_do_redistribute_c4_3D -#include +#include #endif #undef MPP_TYPE_ #define MPP_TYPE_ integer(i4_kind) #undef MPP_DO_REDISTRIBUTE_3D_ #define MPP_DO_REDISTRIBUTE_3D_ mpp_do_redistribute_i4_3D -#include +#include #undef MPP_TYPE_ #define MPP_TYPE_ logical(l4_kind) #undef MPP_DO_REDISTRIBUTE_3D_ #define MPP_DO_REDISTRIBUTE_3D_ mpp_do_redistribute_l4_3D -#include +#include #undef MPP_TYPE_ #define MPP_TYPE_ real(r8_kind) @@ -1871,7 +1871,7 @@ end subroutine init_nonblock_type !#define MPP_GET_BOUNDARY_4D_V_ mpp_get_boundary_r8_4dv !#undef MPP_GET_BOUNDARY_5D_V_ !#define MPP_GET_BOUNDARY_5D_V_ mpp_get_boundary_r8_5dv -#include +#include #undef MPP_TYPE_ #define MPP_TYPE_ real(r8_kind) @@ -1883,7 +1883,7 @@ end subroutine init_nonblock_type #define MPP_GET_BOUNDARY_AD_2D_V_ mpp_get_boundary_ad_r8_2dv #undef MPP_GET_BOUNDARY_AD_3D_V_ #define MPP_GET_BOUNDARY_AD_3D_V_ mpp_get_boundary_ad_r8_3dv -#include +#include #undef MPP_TYPE_ #define MPP_TYPE_ real(r4_kind) @@ -1903,7 +1903,7 @@ end subroutine init_nonblock_type !#define MPP_GET_BOUNDARY_4D_V_ mpp_get_boundary_r4_4dv !#undef MPP_GET_BOUNDARY_5D_V_ !#define MPP_GET_BOUNDARY_5D_V_ mpp_get_boundary_r4_5dv -#include +#include #undef MPP_TYPE_ #define MPP_TYPE_ real(r4_kind) @@ -1915,7 +1915,7 @@ end subroutine init_nonblock_type #define MPP_GET_BOUNDARY_AD_2D_V_ mpp_get_boundary_ad_r4_2dv #undef MPP_GET_BOUNDARY_AD_3D_V_ #define MPP_GET_BOUNDARY_AD_3D_V_ mpp_get_boundary_ad_r4_3dv -#include +#include #undef MPP_TYPE_ #define MPP_TYPE_ real(r8_kind) @@ -1923,7 +1923,7 @@ end subroutine init_nonblock_type #define MPP_DO_GET_BOUNDARY_3D_ mpp_do_get_boundary_r8_3d #undef MPP_DO_GET_BOUNDARY_3DV_ #define MPP_DO_GET_BOUNDARY_3D_V_ mpp_do_get_boundary_r8_3dv -#include +#include #undef MPP_TYPE_ #define MPP_TYPE_ real(r8_kind) @@ -1931,7 +1931,7 @@ end subroutine init_nonblock_type #define MPP_DO_GET_BOUNDARY_AD_3D_ mpp_do_get_boundary_ad_r8_3d #undef MPP_DO_GET_BOUNDARY_AD_3DV_ #define MPP_DO_GET_BOUNDARY_AD_3D_V_ mpp_do_get_boundary_ad_r8_3dv -#include +#include #undef MPP_TYPE_ #define MPP_TYPE_ real(r4_kind) @@ -1939,7 +1939,7 @@ end subroutine init_nonblock_type #define MPP_DO_GET_BOUNDARY_3D_ mpp_do_get_boundary_r4_3d #undef MPP_DO_GET_BOUNDARY_3D_V_ #define MPP_DO_GET_BOUNDARY_3D_V_ mpp_do_get_boundary_r4_3dv -#include +#include #undef MPP_TYPE_ #define MPP_TYPE_ real(r4_kind) @@ -1947,7 +1947,7 @@ end subroutine init_nonblock_type #define MPP_DO_GET_BOUNDARY_AD_3D_ mpp_do_get_boundary_ad_r4_3d #undef MPP_DO_GET_BOUNDARY_AD_3D_V_ #define MPP_DO_GET_BOUNDARY_AD_3D_V_ mpp_do_get_boundary_ad_r4_3dv -#include +#include #undef MPP_TYPE_ #define MPP_TYPE_ real(r8_kind) @@ -1983,7 +1983,7 @@ end subroutine init_nonblock_type #define MPP_RESET_GROUP_UPDATE_FIELD_3D_V_ mpp_reset_group_update_field_r8_3dv #undef MPP_RESET_GROUP_UPDATE_FIELD_4D_V_ #define MPP_RESET_GROUP_UPDATE_FIELD_4D_V_ mpp_reset_group_update_field_r8_4dv -#include +#include #undef MPP_TYPE_ #define MPP_TYPE_ real(r4_kind) @@ -2019,4 +2019,4 @@ end subroutine init_nonblock_type #define MPP_RESET_GROUP_UPDATE_FIELD_3D_V_ mpp_reset_group_update_field_r4_3dv #undef MPP_RESET_GROUP_UPDATE_FIELD_4D_V_ #define MPP_RESET_GROUP_UPDATE_FIELD_4D_V_ mpp_reset_group_update_field_r4_4dv -#include +#include diff --git a/mpp/include/mpp_domains_reduce.inc b/mpp/include/mpp_domains_reduce.inc index c0ef09d0e1..613a1eaeb4 100644 --- a/mpp/include/mpp_domains_reduce.inc +++ b/mpp/include/mpp_domains_reduce.inc @@ -46,7 +46,7 @@ #define REDUCE_LOC_ maxloc #undef MPP_REDUCE_ #define MPP_REDUCE_ mpp_max -#include +#include #undef MPP_GLOBAL_REDUCE_2D_ #define MPP_GLOBAL_REDUCE_2D_ mpp_global_min_r8_2d @@ -64,7 +64,7 @@ #define REDUCE_LOC_ minloc #undef MPP_REDUCE_ #define MPP_REDUCE_ mpp_min -#include +#include #undef MPP_GLOBAL_REDUCE_2D_ #define MPP_GLOBAL_REDUCE_2D_ mpp_global_max_r4_2d @@ -82,7 +82,7 @@ #define REDUCE_LOC_ maxloc #undef MPP_REDUCE_ #define MPP_REDUCE_ mpp_max -#include +#include #undef MPP_GLOBAL_REDUCE_2D_ #define MPP_GLOBAL_REDUCE_2D_ mpp_global_min_r4_2d @@ -100,7 +100,7 @@ #define REDUCE_LOC_ minloc #undef MPP_REDUCE_ #define MPP_REDUCE_ mpp_min -#include +#include #undef MPP_GLOBAL_REDUCE_2D_ #define MPP_GLOBAL_REDUCE_2D_ mpp_global_max_i8_2d @@ -118,7 +118,7 @@ #define REDUCE_LOC_ maxloc #undef MPP_REDUCE_ #define MPP_REDUCE_ mpp_max -#include +#include #undef MPP_GLOBAL_REDUCE_2D_ #define MPP_GLOBAL_REDUCE_2D_ mpp_global_min_i8_2d @@ -136,7 +136,7 @@ #define REDUCE_LOC_ minloc #undef MPP_REDUCE_ #define MPP_REDUCE_ mpp_min -#include +#include #undef MPP_GLOBAL_REDUCE_2D_ #define MPP_GLOBAL_REDUCE_2D_ mpp_global_max_i4_2d @@ -154,7 +154,7 @@ #define REDUCE_LOC_ maxloc #undef MPP_REDUCE_ #define MPP_REDUCE_ mpp_max -#include +#include #undef MPP_GLOBAL_REDUCE_2D_ #define MPP_GLOBAL_REDUCE_2D_ mpp_global_min_i4_2d @@ -172,7 +172,7 @@ #define REDUCE_LOC_ minloc #undef MPP_REDUCE_ #define MPP_REDUCE_ mpp_min -#include +#include !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! ! @@ -186,7 +186,7 @@ #define MPP_EXTRA_INDICES_ #undef MPP_TYPE_ #define MPP_TYPE_ real(r8_kind) -#include +#include #undef MPP_GLOBAL_SUM_ #define MPP_GLOBAL_SUM_ mpp_global_sum_r8_3d @@ -194,7 +194,7 @@ #define MPP_EXTRA_INDICES_ ,: #undef MPP_TYPE_ #define MPP_TYPE_ real(r8_kind) -#include +#include #undef MPP_GLOBAL_SUM_ #define MPP_GLOBAL_SUM_ mpp_global_sum_r8_4d @@ -202,7 +202,7 @@ #define MPP_EXTRA_INDICES_ ,:,: #undef MPP_TYPE_ #define MPP_TYPE_ real(r8_kind) -#include +#include #undef MPP_GLOBAL_SUM_ #define MPP_GLOBAL_SUM_ mpp_global_sum_r8_5d @@ -210,7 +210,7 @@ #define MPP_EXTRA_INDICES_ ,:,:,: #undef MPP_TYPE_ #define MPP_TYPE_ real(r8_kind) -#include +#include #undef MPP_GLOBAL_SUM_ #define MPP_GLOBAL_SUM_ mpp_global_sum_r4_2d @@ -218,7 +218,7 @@ #define MPP_EXTRA_INDICES_ #undef MPP_TYPE_ #define MPP_TYPE_ real(r4_kind) -#include +#include #undef MPP_GLOBAL_SUM_ #define MPP_GLOBAL_SUM_ mpp_global_sum_r4_3d @@ -226,7 +226,7 @@ #define MPP_EXTRA_INDICES_ ,: #undef MPP_TYPE_ #define MPP_TYPE_ real(r4_kind) -#include +#include #undef MPP_GLOBAL_SUM_ #define MPP_GLOBAL_SUM_ mpp_global_sum_r4_4d @@ -234,7 +234,7 @@ #define MPP_EXTRA_INDICES_ ,:,: #undef MPP_TYPE_ #define MPP_TYPE_ real(r4_kind) -#include +#include #undef MPP_GLOBAL_SUM_ #define MPP_GLOBAL_SUM_ mpp_global_sum_r4_5d @@ -242,7 +242,7 @@ #define MPP_EXTRA_INDICES_ ,:,:,: #undef MPP_TYPE_ #define MPP_TYPE_ real(r4_kind) -#include +#include #undef DO_EFP_SUM_ @@ -253,7 +253,7 @@ #define MPP_EXTRA_INDICES_ #undef MPP_TYPE_ #define MPP_TYPE_ complex(c4_kind) -#include +#include #undef MPP_GLOBAL_SUM_ #define MPP_GLOBAL_SUM_ mpp_global_sum_c4_3d @@ -261,7 +261,7 @@ #define MPP_EXTRA_INDICES_ ,: #undef MPP_TYPE_ #define MPP_TYPE_ complex(c4_kind) -#include +#include #undef MPP_GLOBAL_SUM_ #define MPP_GLOBAL_SUM_ mpp_global_sum_c4_4d @@ -269,7 +269,7 @@ #define MPP_EXTRA_INDICES_ ,:,: #undef MPP_TYPE_ #define MPP_TYPE_ complex(c4_kind) -#include +#include #undef MPP_GLOBAL_SUM_ #define MPP_GLOBAL_SUM_ mpp_global_sum_c4_5d @@ -277,7 +277,7 @@ #define MPP_EXTRA_INDICES_ ,:,:,: #undef MPP_TYPE_ #define MPP_TYPE_ complex(c4_kind) -#include +#include #endif #ifdef OVERLOAD_C8 @@ -287,7 +287,7 @@ #define MPP_EXTRA_INDICES_ #undef MPP_TYPE_ #define MPP_TYPE_ complex(c8_kind) -#include +#include #undef MPP_GLOBAL_SUM_ #define MPP_GLOBAL_SUM_ mpp_global_sum_c8_3d @@ -295,7 +295,7 @@ #define MPP_EXTRA_INDICES_ ,: #undef MPP_TYPE_ #define MPP_TYPE_ complex(c8_kind) -#include +#include #undef MPP_GLOBAL_SUM_ #define MPP_GLOBAL_SUM_ mpp_global_sum_c8_4d @@ -303,7 +303,7 @@ #define MPP_EXTRA_INDICES_ ,:,: #undef MPP_TYPE_ #define MPP_TYPE_ complex(c8_kind) -#include +#include #undef MPP_GLOBAL_SUM_ #define MPP_GLOBAL_SUM_ mpp_global_sum_c8_5d @@ -311,7 +311,7 @@ #define MPP_EXTRA_INDICES_ ,:,:,: #undef MPP_TYPE_ #define MPP_TYPE_ complex(c8_kind) -#include +#include #endif #undef MPP_GLOBAL_SUM_ @@ -320,7 +320,7 @@ #define MPP_EXTRA_INDICES_ #undef MPP_TYPE_ #define MPP_TYPE_ integer(i8_kind) -#include +#include #undef MPP_GLOBAL_SUM_ #define MPP_GLOBAL_SUM_ mpp_global_sum_i8_3d @@ -328,7 +328,7 @@ #define MPP_EXTRA_INDICES_ ,: #undef MPP_TYPE_ #define MPP_TYPE_ integer(i8_kind) -#include +#include #undef MPP_GLOBAL_SUM_ #define MPP_GLOBAL_SUM_ mpp_global_sum_i8_4d @@ -336,7 +336,7 @@ #define MPP_EXTRA_INDICES_ ,:,: #undef MPP_TYPE_ #define MPP_TYPE_ integer(i8_kind) -#include +#include #undef MPP_GLOBAL_SUM_ #define MPP_GLOBAL_SUM_ mpp_global_sum_i8_5d @@ -344,7 +344,7 @@ #define MPP_EXTRA_INDICES_ ,:,:,: #undef MPP_TYPE_ #define MPP_TYPE_ integer(i8_kind) -#include +#include #undef MPP_GLOBAL_SUM_ #define MPP_GLOBAL_SUM_ mpp_global_sum_i4_2d @@ -352,7 +352,7 @@ #define MPP_EXTRA_INDICES_ #undef MPP_TYPE_ #define MPP_TYPE_ integer(i4_kind) -#include +#include #undef MPP_GLOBAL_SUM_ #define MPP_GLOBAL_SUM_ mpp_global_sum_i4_3d @@ -360,7 +360,7 @@ #define MPP_EXTRA_INDICES_ ,: #undef MPP_TYPE_ #define MPP_TYPE_ integer(i4_kind) -#include +#include #undef MPP_GLOBAL_SUM_ #define MPP_GLOBAL_SUM_ mpp_global_sum_i4_4d @@ -368,7 +368,7 @@ #define MPP_EXTRA_INDICES_ ,:,: #undef MPP_TYPE_ #define MPP_TYPE_ integer(i4_kind) -#include +#include #undef MPP_GLOBAL_SUM_ #define MPP_GLOBAL_SUM_ mpp_global_sum_i4_5d @@ -376,7 +376,7 @@ #define MPP_EXTRA_INDICES_ ,:,:,: #undef MPP_TYPE_ #define MPP_TYPE_ integer(i4_kind) -#include +#include !gag @@ -392,7 +392,7 @@ #define MPP_EXTRA_INDICES_ #undef MPP_TYPE_ #define MPP_TYPE_ real(r8_kind) -#include +#include #undef MPP_GLOBAL_SUM_TL_ #define MPP_GLOBAL_SUM_TL_ mpp_global_sum_tl_r8_3d @@ -400,7 +400,7 @@ #define MPP_EXTRA_INDICES_ ,: #undef MPP_TYPE_ #define MPP_TYPE_ real(r8_kind) -#include +#include #undef MPP_GLOBAL_SUM_TL_ #define MPP_GLOBAL_SUM_TL_ mpp_global_sum_tl_r8_4d @@ -408,7 +408,7 @@ #define MPP_EXTRA_INDICES_ ,:,: #undef MPP_TYPE_ #define MPP_TYPE_ real(r8_kind) -#include +#include #undef MPP_GLOBAL_SUM_TL_ #define MPP_GLOBAL_SUM_TL_ mpp_global_sum_tl_r8_5d @@ -416,7 +416,7 @@ #define MPP_EXTRA_INDICES_ ,:,:,: #undef MPP_TYPE_ #define MPP_TYPE_ real(r8_kind) -#include +#include #ifdef OVERLOAD_C8 #undef MPP_GLOBAL_SUM_TL_ @@ -425,7 +425,7 @@ #define MPP_EXTRA_INDICES_ #undef MPP_TYPE_ #define MPP_TYPE_ complex(c8_kind) -#include +#include #undef MPP_GLOBAL_SUM_TL_ #define MPP_GLOBAL_SUM_TL_ mpp_global_sum_tl_c8_3d @@ -433,7 +433,7 @@ #define MPP_EXTRA_INDICES_ ,: #undef MPP_TYPE_ #define MPP_TYPE_ complex(c8_kind) -#include +#include #undef MPP_GLOBAL_SUM_TL_ #define MPP_GLOBAL_SUM_TL_ mpp_global_sum_tl_c8_4d @@ -441,7 +441,7 @@ #define MPP_EXTRA_INDICES_ ,:,: #undef MPP_TYPE_ #define MPP_TYPE_ complex(c8_kind) -#include +#include #undef MPP_GLOBAL_SUM_TL_ #define MPP_GLOBAL_SUM_TL_ mpp_global_sum_tl_c8_5d @@ -449,7 +449,7 @@ #define MPP_EXTRA_INDICES_ ,:,:,: #undef MPP_TYPE_ #define MPP_TYPE_ complex(c8_kind) -#include +#include #endif #undef MPP_GLOBAL_SUM_TL_ @@ -458,7 +458,7 @@ #define MPP_EXTRA_INDICES_ #undef MPP_TYPE_ #define MPP_TYPE_ real(r4_kind) -#include +#include #undef MPP_GLOBAL_SUM_TL_ #define MPP_GLOBAL_SUM_TL_ mpp_global_sum_tl_r4_3d @@ -466,7 +466,7 @@ #define MPP_EXTRA_INDICES_ ,: #undef MPP_TYPE_ #define MPP_TYPE_ real(r4_kind) -#include +#include #undef MPP_GLOBAL_SUM_TL_ #define MPP_GLOBAL_SUM_TL_ mpp_global_sum_tl_r4_4d @@ -474,7 +474,7 @@ #define MPP_EXTRA_INDICES_ ,:,: #undef MPP_TYPE_ #define MPP_TYPE_ real(r4_kind) -#include +#include #undef MPP_GLOBAL_SUM_TL_ #define MPP_GLOBAL_SUM_TL_ mpp_global_sum_tl_r4_5d @@ -482,7 +482,7 @@ #define MPP_EXTRA_INDICES_ ,:,:,: #undef MPP_TYPE_ #define MPP_TYPE_ real(r4_kind) -#include +#include #ifdef OVERLOAD_C4 #undef MPP_GLOBAL_SUM_TL_ @@ -491,7 +491,7 @@ #define MPP_EXTRA_INDICES_ #undef MPP_TYPE_ #define MPP_TYPE_ complex(c4_kind) -#include +#include #undef MPP_GLOBAL_SUM_TL_ #define MPP_GLOBAL_SUM_TL_ mpp_global_sum_tl_c4_3d @@ -499,7 +499,7 @@ #define MPP_EXTRA_INDICES_ ,: #undef MPP_TYPE_ #define MPP_TYPE_ complex(c4_kind) -#include +#include #undef MPP_GLOBAL_SUM_TL_ #define MPP_GLOBAL_SUM_TL_ mpp_global_sum_tl_c4_4d @@ -507,7 +507,7 @@ #define MPP_EXTRA_INDICES_ ,:,: #undef MPP_TYPE_ #define MPP_TYPE_ complex(c4_kind) -#include +#include #undef MPP_GLOBAL_SUM_TL_ #define MPP_GLOBAL_SUM_TL_ mpp_global_sum_tl_c4_5d @@ -515,7 +515,7 @@ #define MPP_EXTRA_INDICES_ ,:,:,: #undef MPP_TYPE_ #define MPP_TYPE_ complex(c4_kind) -#include +#include #endif #undef MPP_GLOBAL_SUM_TL_ @@ -524,7 +524,7 @@ #define MPP_EXTRA_INDICES_ #undef MPP_TYPE_ #define MPP_TYPE_ integer(i8_kind) -#include +#include #undef MPP_GLOBAL_SUM_TL_ #define MPP_GLOBAL_SUM_TL_ mpp_global_sum_tl_i8_3d @@ -532,7 +532,7 @@ #define MPP_EXTRA_INDICES_ ,: #undef MPP_TYPE_ #define MPP_TYPE_ integer(i8_kind) -#include +#include #undef MPP_GLOBAL_SUM_TL_ #define MPP_GLOBAL_SUM_TL_ mpp_global_sum_tl_i8_4d @@ -540,7 +540,7 @@ #define MPP_EXTRA_INDICES_ ,:,: #undef MPP_TYPE_ #define MPP_TYPE_ integer(i8_kind) -#include +#include #undef MPP_GLOBAL_SUM_TL_ #define MPP_GLOBAL_SUM_TL_ mpp_global_sum_tl_i8_5d @@ -548,7 +548,7 @@ #define MPP_EXTRA_INDICES_ ,:,:,: #undef MPP_TYPE_ #define MPP_TYPE_ integer(i8_kind) -#include +#include #undef MPP_GLOBAL_SUM_TL_ #define MPP_GLOBAL_SUM_TL_ mpp_global_sum_tl_i4_2d @@ -556,7 +556,7 @@ #define MPP_EXTRA_INDICES_ #undef MPP_TYPE_ #define MPP_TYPE_ integer(i4_kind) -#include +#include #undef MPP_GLOBAL_SUM_TL_ #define MPP_GLOBAL_SUM_TL_ mpp_global_sum_tl_i4_3d @@ -564,7 +564,7 @@ #define MPP_EXTRA_INDICES_ ,: #undef MPP_TYPE_ #define MPP_TYPE_ integer(i4_kind) -#include +#include #undef MPP_GLOBAL_SUM_TL_ #define MPP_GLOBAL_SUM_TL_ mpp_global_sum_tl_i4_4d @@ -572,7 +572,7 @@ #define MPP_EXTRA_INDICES_ ,:,: #undef MPP_TYPE_ #define MPP_TYPE_ integer(i4_kind) -#include +#include #undef MPP_GLOBAL_SUM_TL_ #define MPP_GLOBAL_SUM_TL_ mpp_global_sum_tl_i4_5d @@ -580,7 +580,7 @@ #define MPP_EXTRA_INDICES_ ,:,:,: #undef MPP_TYPE_ #define MPP_TYPE_ integer(i4_kind) -#include +#include !gag !bnc @@ -596,7 +596,7 @@ #define MPP_EXTRA_INDICES_ #undef MPP_TYPE_ #define MPP_TYPE_ real(r8_kind) -#include +#include #undef MPP_GLOBAL_SUM_AD_ #define MPP_GLOBAL_SUM_AD_ mpp_global_sum_ad_r8_3d @@ -604,7 +604,7 @@ #define MPP_EXTRA_INDICES_ ,: #undef MPP_TYPE_ #define MPP_TYPE_ real(r8_kind) -#include +#include #undef MPP_GLOBAL_SUM_AD_ #define MPP_GLOBAL_SUM_AD_ mpp_global_sum_ad_r8_4d @@ -612,7 +612,7 @@ #define MPP_EXTRA_INDICES_ ,:,: #undef MPP_TYPE_ #define MPP_TYPE_ real(r8_kind) -#include +#include #undef MPP_GLOBAL_SUM_AD_ #define MPP_GLOBAL_SUM_AD_ mpp_global_sum_ad_r8_5d @@ -620,7 +620,7 @@ #define MPP_EXTRA_INDICES_ ,:,:,: #undef MPP_TYPE_ #define MPP_TYPE_ real(r8_kind) -#include +#include #ifdef OVERLOAD_C8 #undef MPP_GLOBAL_SUM_AD_ @@ -629,7 +629,7 @@ #define MPP_EXTRA_INDICES_ #undef MPP_TYPE_ #define MPP_TYPE_ complex(c8_kind) -#include +#include #undef MPP_GLOBAL_SUM_AD_ #define MPP_GLOBAL_SUM_AD_ mpp_global_sum_ad_c8_3d @@ -637,7 +637,7 @@ #define MPP_EXTRA_INDICES_ ,: #undef MPP_TYPE_ #define MPP_TYPE_ complex(c8_kind) -#include +#include #undef MPP_GLOBAL_SUM_AD_ #define MPP_GLOBAL_SUM_AD_ mpp_global_sum_ad_c8_4d @@ -645,7 +645,7 @@ #define MPP_EXTRA_INDICES_ ,:,: #undef MPP_TYPE_ #define MPP_TYPE_ complex(c8_kind) -#include +#include #undef MPP_GLOBAL_SUM_AD_ #define MPP_GLOBAL_SUM_AD_ mpp_global_sum_ad_c8_5d @@ -653,7 +653,7 @@ #define MPP_EXTRA_INDICES_ ,:,:,: #undef MPP_TYPE_ #define MPP_TYPE_ complex(c8_kind) -#include +#include #endif #undef MPP_GLOBAL_SUM_AD_ @@ -662,7 +662,7 @@ #define MPP_EXTRA_INDICES_ #undef MPP_TYPE_ #define MPP_TYPE_ real(r4_kind) -#include +#include #undef MPP_GLOBAL_SUM_AD_ #define MPP_GLOBAL_SUM_AD_ mpp_global_sum_ad_r4_3d @@ -670,7 +670,7 @@ #define MPP_EXTRA_INDICES_ ,: #undef MPP_TYPE_ #define MPP_TYPE_ real(r4_kind) -#include +#include #undef MPP_GLOBAL_SUM_AD_ #define MPP_GLOBAL_SUM_AD_ mpp_global_sum_ad_r4_4d @@ -678,7 +678,7 @@ #define MPP_EXTRA_INDICES_ ,:,: #undef MPP_TYPE_ #define MPP_TYPE_ real(r4_kind) -#include +#include #undef MPP_GLOBAL_SUM_AD_ #define MPP_GLOBAL_SUM_AD_ mpp_global_sum_ad_r4_5d @@ -686,7 +686,7 @@ #define MPP_EXTRA_INDICES_ ,:,:,: #undef MPP_TYPE_ #define MPP_TYPE_ real(r4_kind) -#include +#include #ifdef OVERLOAD_C4 #undef MPP_GLOBAL_SUM_AD_ @@ -695,7 +695,7 @@ #define MPP_EXTRA_INDICES_ #undef MPP_TYPE_ #define MPP_TYPE_ complex(c4_kind) -#include +#include #undef MPP_GLOBAL_SUM_AD_ #define MPP_GLOBAL_SUM_AD_ mpp_global_sum_ad_c4_3d @@ -703,7 +703,7 @@ #define MPP_EXTRA_INDICES_ ,: #undef MPP_TYPE_ #define MPP_TYPE_ complex(c4_kind) -#include +#include #undef MPP_GLOBAL_SUM_AD_ #define MPP_GLOBAL_SUM_AD_ mpp_global_sum_ad_c4_4d @@ -711,7 +711,7 @@ #define MPP_EXTRA_INDICES_ ,:,: #undef MPP_TYPE_ #define MPP_TYPE_ complex(c4_kind) -#include +#include #undef MPP_GLOBAL_SUM_AD_ #define MPP_GLOBAL_SUM_AD_ mpp_global_sum_ad_c4_5d @@ -719,7 +719,7 @@ #define MPP_EXTRA_INDICES_ ,:,:,: #undef MPP_TYPE_ #define MPP_TYPE_ complex(c4_kind) -#include +#include #endif #undef MPP_GLOBAL_SUM_AD_ @@ -728,7 +728,7 @@ #define MPP_EXTRA_INDICES_ #undef MPP_TYPE_ #define MPP_TYPE_ integer(i8_kind) -#include +#include #undef MPP_GLOBAL_SUM_AD_ #define MPP_GLOBAL_SUM_AD_ mpp_global_sum_ad_i8_3d @@ -736,7 +736,7 @@ #define MPP_EXTRA_INDICES_ ,: #undef MPP_TYPE_ #define MPP_TYPE_ integer(i8_kind) -#include +#include #undef MPP_GLOBAL_SUM_AD_ #define MPP_GLOBAL_SUM_AD_ mpp_global_sum_ad_i8_4d @@ -744,7 +744,7 @@ #define MPP_EXTRA_INDICES_ ,:,: #undef MPP_TYPE_ #define MPP_TYPE_ integer(i8_kind) -#include +#include #undef MPP_GLOBAL_SUM_AD_ #define MPP_GLOBAL_SUM_AD_ mpp_global_sum_ad_i8_5d @@ -752,7 +752,7 @@ #define MPP_EXTRA_INDICES_ ,:,:,: #undef MPP_TYPE_ #define MPP_TYPE_ integer(i8_kind) -#include +#include #undef MPP_GLOBAL_SUM_AD_ #define MPP_GLOBAL_SUM_AD_ mpp_global_sum_ad_i4_2d @@ -760,7 +760,7 @@ #define MPP_EXTRA_INDICES_ #undef MPP_TYPE_ #define MPP_TYPE_ integer(i4_kind) -#include +#include #undef MPP_GLOBAL_SUM_AD_ #define MPP_GLOBAL_SUM_AD_ mpp_global_sum_ad_i4_3d @@ -768,7 +768,7 @@ #define MPP_EXTRA_INDICES_ ,: #undef MPP_TYPE_ #define MPP_TYPE_ integer(i4_kind) -#include +#include #undef MPP_GLOBAL_SUM_AD_ #define MPP_GLOBAL_SUM_AD_ mpp_global_sum_ad_i4_4d @@ -776,7 +776,7 @@ #define MPP_EXTRA_INDICES_ ,:,: #undef MPP_TYPE_ #define MPP_TYPE_ integer(i4_kind) -#include +#include #undef MPP_GLOBAL_SUM_AD_ #define MPP_GLOBAL_SUM_AD_ mpp_global_sum_ad_i4_5d @@ -784,7 +784,7 @@ #define MPP_EXTRA_INDICES_ ,:,:,: #undef MPP_TYPE_ #define MPP_TYPE_ integer(i4_kind) -#include +#include !bnc !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -804,7 +804,7 @@ #define MPP_GLOBAL_FIELD_5D_ mpp_global_field2D_r8_5d #undef MPP_TYPE_ #define MPP_TYPE_ real(r8_kind) -#include +#include #ifdef OVERLOAD_C8 #undef MPP_GLOBAL_FIELD_2D_ @@ -817,7 +817,7 @@ #define MPP_GLOBAL_FIELD_5D_ mpp_global_field2D_c8_5d #undef MPP_TYPE_ #define MPP_TYPE_ complex(c8_kind) -#include +#include #endif #undef MPP_TYPE_INIT_VALUE @@ -832,7 +832,7 @@ #define MPP_GLOBAL_FIELD_5D_ mpp_global_field2D_i8_5d #undef MPP_TYPE_ #define MPP_TYPE_ integer(i8_kind) -#include +#include #undef MPP_TYPE_INIT_VALUE #define MPP_TYPE_INIT_VALUE .false. @@ -846,7 +846,7 @@ #define MPP_GLOBAL_FIELD_5D_ mpp_global_field2D_l8_5d #undef MPP_TYPE_ #define MPP_TYPE_ logical(l8_kind) -#include +#include #undef MPP_TYPE_INIT_VALUE #define MPP_TYPE_INIT_VALUE 0. @@ -860,7 +860,7 @@ #define MPP_GLOBAL_FIELD_5D_ mpp_global_field2D_r4_5d #undef MPP_TYPE_ #define MPP_TYPE_ real(r4_kind) -#include +#include #ifdef OVERLOAD_C4 #undef MPP_GLOBAL_FIELD_2D_ @@ -873,7 +873,7 @@ #define MPP_GLOBAL_FIELD_5D_ mpp_global_field2D_c4_5d #undef MPP_TYPE_ #define MPP_TYPE_ complex(c4_kind) -#include +#include #endif #undef MPP_TYPE_INIT_VALUE @@ -888,7 +888,7 @@ #define MPP_GLOBAL_FIELD_5D_ mpp_global_field2D_i4_5d #undef MPP_TYPE_ #define MPP_TYPE_ integer(i4_kind) -#include +#include #undef MPP_TYPE_INIT_VALUE #define MPP_TYPE_INIT_VALUE .false. @@ -902,7 +902,7 @@ #define MPP_GLOBAL_FIELD_5D_ mpp_global_field2D_l4_5d #undef MPP_TYPE_ #define MPP_TYPE_ logical(l4_kind) -#include +#include #undef MPP_TYPE_INIT_VALUE !**************************************************** @@ -917,7 +917,7 @@ #define MPP_GLOBAL_FIELD_5D_AD_ mpp_global_field2D_r8_5d_ad #undef MPP_TYPE_ #define MPP_TYPE_ real(r8_kind) -#include +#include #ifdef OVERLOAD_C8 #undef MPP_GLOBAL_FIELD_2D_AD_ @@ -930,7 +930,7 @@ #define MPP_GLOBAL_FIELD_5D_AD_ mpp_global_field2D_c8_5d_ad #undef MPP_TYPE_ #define MPP_TYPE_ complex(c8_kind) -#include +#include #endif #undef MPP_TYPE_INIT_VALUE @@ -945,7 +945,7 @@ #define MPP_GLOBAL_FIELD_5D_AD_ mpp_global_field2D_i8_5d_ad #undef MPP_TYPE_ #define MPP_TYPE_ integer(i8_kind) -#include +#include #undef MPP_TYPE_INIT_VALUE #define MPP_TYPE_INIT_VALUE .false. @@ -959,7 +959,7 @@ #define MPP_GLOBAL_FIELD_5D_AD_ mpp_global_field2D_l8_5d_ad #undef MPP_TYPE_ #define MPP_TYPE_ logical(l8_kind) -#include +#include #undef MPP_TYPE_INIT_VALUE #define MPP_TYPE_INIT_VALUE 0. @@ -973,7 +973,7 @@ #define MPP_GLOBAL_FIELD_5D_AD_ mpp_global_field2D_r4_5d_ad #undef MPP_TYPE_ #define MPP_TYPE_ real(r4_kind) -#include +#include #ifdef OVERLOAD_C4 #undef MPP_GLOBAL_FIELD_2D_AD_ @@ -986,7 +986,7 @@ #define MPP_GLOBAL_FIELD_5D_AD_ mpp_global_field2D_c4_5d_ad #undef MPP_TYPE_ #define MPP_TYPE_ complex(c4_kind) -#include +#include #endif #undef MPP_TYPE_INIT_VALUE @@ -1001,7 +1001,7 @@ #define MPP_GLOBAL_FIELD_5D_AD_ mpp_global_field2D_i4_5d_ad #undef MPP_TYPE_ #define MPP_TYPE_ integer(i4_kind) -#include +#include #undef MPP_TYPE_INIT_VALUE #define MPP_TYPE_INIT_VALUE .false. @@ -1015,7 +1015,7 @@ #define MPP_GLOBAL_FIELD_5D_AD_ mpp_global_field2D_l4_5d_ad #undef MPP_TYPE_ #define MPP_TYPE_ logical(l4_kind) -#include +#include #undef MPP_TYPE_INIT_VALUE !**************************************************** @@ -1025,7 +1025,7 @@ #define MPP_DO_GLOBAL_FIELD_A2A_3D_ mpp_do_global_field2D_a2a_r8_3d #undef MPP_TYPE_ #define MPP_TYPE_ real(r8_kind) -#include +#include #ifdef OVERLOAD_C8 #undef MPP_DO_GLOBAL_FIELD_3D_ @@ -1034,7 +1034,7 @@ #define MPP_DO_GLOBAL_FIELD_A2A_3D_ mpp_do_global_field2D_a2a_c8_3d #undef MPP_TYPE_ #define MPP_TYPE_ complex(c8_kind) -#include +#include #endif #undef MPP_DO_GLOBAL_FIELD_3D_ @@ -1043,7 +1043,7 @@ #define MPP_DO_GLOBAL_FIELD_A2A_3D_ mpp_do_global_field2D_a2a_i8_3d #undef MPP_TYPE_ #define MPP_TYPE_ integer(i8_kind) -#include +#include #undef MPP_DO_GLOBAL_FIELD_3D_ #undef MPP_DO_GLOBAL_FIELD_A2A_3D_ @@ -1052,7 +1052,7 @@ #define LOGICAL_VARIABLE #undef MPP_TYPE_ #define MPP_TYPE_ logical(l8_kind) -#include +#include #undef LOGICAL_VARIABLE #undef MPP_DO_GLOBAL_FIELD_3D_ @@ -1061,7 +1061,7 @@ #define MPP_DO_GLOBAL_FIELD_A2A_3D_ mpp_do_global_field2D_a2a_r4_3d #undef MPP_TYPE_ #define MPP_TYPE_ real(r4_kind) -#include +#include #ifdef OVERLOAD_C4 #undef MPP_DO_GLOBAL_FIELD_3D_ @@ -1070,7 +1070,7 @@ #define MPP_DO_GLOBAL_FIELD_A2A_3D_ mpp_do_global_field2D_a2a_c4_3d #undef MPP_TYPE_ #define MPP_TYPE_ complex(c4_kind) -#include +#include #endif #undef MPP_DO_GLOBAL_FIELD_3D_ @@ -1079,7 +1079,7 @@ #define MPP_DO_GLOBAL_FIELD_A2A_3D_ mpp_do_global_field2D_a2a_i4_3d #undef MPP_TYPE_ #define MPP_TYPE_ integer(i4_kind) -#include +#include #undef MPP_DO_GLOBAL_FIELD_3D_ #undef MPP_DO_GLOBAL_FIELD_A2A_3D_ @@ -1088,62 +1088,62 @@ #define LOGICAL_VARIABLE #undef MPP_TYPE_ #define MPP_TYPE_ logical(l4_kind) -#include +#include #undef LOGICAL_VARIABLE !**************************************************** #undef MPP_DO_GLOBAL_FIELD_3D_AD_ #define MPP_DO_GLOBAL_FIELD_3D_AD_ mpp_do_global_field2D_r8_3d_ad #undef MPP_TYPE_ #define MPP_TYPE_ real(r8_kind) -#include +#include #ifdef OVERLOAD_C8 #undef MPP_DO_GLOBAL_FIELD_3D_AD_ #define MPP_DO_GLOBAL_FIELD_3D_AD_ mpp_do_global_field2D_c8_3d_ad #undef MPP_TYPE_ #define MPP_TYPE_ complex(c8_kind) -#include +#include #endif #undef MPP_DO_GLOBAL_FIELD_3D_AD_ #define MPP_DO_GLOBAL_FIELD_3D_AD_ mpp_do_global_field2D_i8_3d_ad #undef MPP_TYPE_ #define MPP_TYPE_ integer(i8_kind) -#include +#include #undef MPP_DO_GLOBAL_FIELD_3D_AD_ #define MPP_DO_GLOBAL_FIELD_3D_AD_ mpp_do_global_field2D_l8_3d_ad #define LOGICAL_VARIABLE #undef MPP_TYPE_ #define MPP_TYPE_ logical(l8_kind) -#include +#include #undef LOGICAL_VARIABLE #undef MPP_DO_GLOBAL_FIELD_3D_AD_ #define MPP_DO_GLOBAL_FIELD_3D_AD_ mpp_do_global_field2D_r4_3d_ad #undef MPP_TYPE_ #define MPP_TYPE_ real(r4_kind) -#include +#include #ifdef OVERLOAD_C4 #undef MPP_DO_GLOBAL_FIELD_3D_AD_ #define MPP_DO_GLOBAL_FIELD_3D_AD_ mpp_do_global_field2D_c4_3d_ad #undef MPP_TYPE_ #define MPP_TYPE_ complex(c4_kind) -#include +#include #endif #undef MPP_DO_GLOBAL_FIELD_3D_AD_ #define MPP_DO_GLOBAL_FIELD_3D_AD_ mpp_do_global_field2D_i4_3d_ad #undef MPP_TYPE_ #define MPP_TYPE_ integer(i4_kind) -#include +#include #undef MPP_DO_GLOBAL_FIELD_3D_AD_ #define MPP_DO_GLOBAL_FIELD_3D_AD_ mpp_do_global_field2D_l4_3d_ad #define LOGICAL_VARIABLE #undef MPP_TYPE_ #define MPP_TYPE_ logical(l4_kind) -#include +#include #undef LOGICAL_VARIABLE !> @} diff --git a/mpp/include/mpp_error_a_a.h b/mpp/include/mpp_error_a_a.fh similarity index 100% rename from mpp/include/mpp_error_a_a.h rename to mpp/include/mpp_error_a_a.fh diff --git a/mpp/include/mpp_error_a_s.h b/mpp/include/mpp_error_a_s.fh similarity index 100% rename from mpp/include/mpp_error_a_s.h rename to mpp/include/mpp_error_a_s.fh diff --git a/mpp/include/mpp_error_s_a.h b/mpp/include/mpp_error_s_a.fh similarity index 100% rename from mpp/include/mpp_error_s_a.h rename to mpp/include/mpp_error_s_a.fh diff --git a/mpp/include/mpp_error_s_s.h b/mpp/include/mpp_error_s_s.fh similarity index 100% rename from mpp/include/mpp_error_s_s.h rename to mpp/include/mpp_error_s_s.fh diff --git a/mpp/include/mpp_gather.h b/mpp/include/mpp_gather.fh similarity index 100% rename from mpp/include/mpp_gather.h rename to mpp/include/mpp_gather.fh diff --git a/mpp/include/mpp_get_boundary.h b/mpp/include/mpp_get_boundary.fh similarity index 100% rename from mpp/include/mpp_get_boundary.h rename to mpp/include/mpp_get_boundary.fh diff --git a/mpp/include/mpp_get_boundary_ad.h b/mpp/include/mpp_get_boundary_ad.fh similarity index 100% rename from mpp/include/mpp_get_boundary_ad.h rename to mpp/include/mpp_get_boundary_ad.fh diff --git a/mpp/include/mpp_global_field.h b/mpp/include/mpp_global_field.fh similarity index 100% rename from mpp/include/mpp_global_field.h rename to mpp/include/mpp_global_field.fh diff --git a/mpp/include/mpp_global_field_ad.h b/mpp/include/mpp_global_field_ad.fh similarity index 100% rename from mpp/include/mpp_global_field_ad.h rename to mpp/include/mpp_global_field_ad.fh diff --git a/mpp/include/mpp_global_field_ug.h b/mpp/include/mpp_global_field_ug.fh similarity index 100% rename from mpp/include/mpp_global_field_ug.h rename to mpp/include/mpp_global_field_ug.fh diff --git a/mpp/include/mpp_global_reduce.h b/mpp/include/mpp_global_reduce.fh similarity index 100% rename from mpp/include/mpp_global_reduce.h rename to mpp/include/mpp_global_reduce.fh diff --git a/mpp/include/mpp_global_sum.h b/mpp/include/mpp_global_sum.fh similarity index 100% rename from mpp/include/mpp_global_sum.h rename to mpp/include/mpp_global_sum.fh diff --git a/mpp/include/mpp_global_sum_ad.h b/mpp/include/mpp_global_sum_ad.fh similarity index 100% rename from mpp/include/mpp_global_sum_ad.h rename to mpp/include/mpp_global_sum_ad.fh diff --git a/mpp/include/mpp_global_sum_tl.h b/mpp/include/mpp_global_sum_tl.fh similarity index 100% rename from mpp/include/mpp_global_sum_tl.h rename to mpp/include/mpp_global_sum_tl.fh diff --git a/mpp/include/mpp_group_update.h b/mpp/include/mpp_group_update.fh similarity index 100% rename from mpp/include/mpp_group_update.h rename to mpp/include/mpp_group_update.fh diff --git a/mpp/include/mpp_io_read.inc b/mpp/include/mpp_io_read.inc index 8645805098..de343a4f13 100644 --- a/mpp/include/mpp_io_read.inc +++ b/mpp/include/mpp_io_read.inc @@ -42,7 +42,7 @@ #define MPP_READ_2DDECOMP_4D_ mpp_read_2ddecomp_r4d_r8 #undef MPP_TYPE_ #define MPP_TYPE_ real(KIND=r8_kind) -#include +#include #undef READ_RECORD_CORE_ #define READ_RECORD_CORE_ read_record_core_r4 @@ -56,7 +56,7 @@ #define MPP_READ_2DDECOMP_4D_ mpp_read_2ddecomp_r4d_r4 #undef MPP_TYPE_ #define MPP_TYPE_ real(KIND=r4_kind) -#include +#include #undef READ_RECORD_ #define READ_RECORD_ read_record_r8 @@ -68,7 +68,7 @@ #define MPP_READ_COMPRESSED_3D_ mpp_read_compressed_r3d_r8 #undef MPP_TYPE_ #define MPP_TYPE_ real(KIND=r8_kind) -#include +#include #undef READ_RECORD_ #define READ_RECORD_ read_record_r4 @@ -80,7 +80,7 @@ #define MPP_READ_COMPRESSED_3D_ mpp_read_compressed_r3d_r4 #undef MPP_TYPE_ #define MPP_TYPE_ real(KIND=r4_kind) -#include +#include #include diff --git a/mpp/include/mpp_io_write.inc b/mpp/include/mpp_io_write.inc index ed08c14398..80a8332a9b 100644 --- a/mpp/include/mpp_io_write.inc +++ b/mpp/include/mpp_io_write.inc @@ -1007,7 +1007,7 @@ #define MPP_WRITE_2DDECOMP_4D_ mpp_write_2ddecomp_r4d_r8 #undef MPP_TYPE_ #define MPP_TYPE_ real(KIND=r8_kind) -#include +#include #undef WRITE_RECORD_ #define WRITE_RECORD_ write_record_r4 @@ -1019,7 +1019,7 @@ #define MPP_WRITE_2DDECOMP_4D_ mpp_write_2ddecomp_r4d_r4 #undef MPP_TYPE_ #define MPP_TYPE_ real(KIND=r4_kind) -#include +#include #undef MPP_WRITE_COMPRESSED_1D_ #define MPP_WRITE_COMPRESSED_1D_ mpp_write_compressed_r1d_r8 @@ -1031,7 +1031,7 @@ #define WRITE_RECORD_ write_record_r8 #undef MPP_TYPE_ #define MPP_TYPE_ real(KIND=r8_kind) -#include +#include #undef MPP_WRITE_COMPRESSED_1D_ #define MPP_WRITE_COMPRESSED_1D_ mpp_write_compressed_r1d_r4 @@ -1043,13 +1043,13 @@ #define WRITE_RECORD_ write_record_r4 #undef MPP_TYPE_ #define MPP_TYPE_ real(KIND=r4_kind) -#include +#include #undef MPP_WRITE_UNLIMITED_AXIS_1D_ #define MPP_WRITE_UNLIMITED_AXIS_1D_ mpp_write_unlimited_axis_r1d #undef MPP_TYPE_ #define MPP_TYPE_ real -#include +#include #undef MPP_WRITE_ #define MPP_WRITE_ mpp_write_r0D_r8 @@ -1059,7 +1059,7 @@ #define MPP_RANK_ ! #undef MPP_WRITE_RECORD_ #define MPP_WRITE_RECORD_ write_record_r8( unit, field, 1, (/data/), tstamp) -#include +#include #undef MPP_WRITE_ #define MPP_WRITE_ mpp_write_r1D_r8 @@ -1069,7 +1069,7 @@ #define MPP_WRITE_RECORD_ write_record_r8( unit, field, size(data(:)), data, tstamp) #undef MPP_RANK_ #define MPP_RANK_ (:) -#include +#include #undef MPP_WRITE_ #define MPP_WRITE_ mpp_write_r2D_r8 @@ -1079,7 +1079,7 @@ #define MPP_WRITE_RECORD_ write_record_r8( unit, field, size(data(:,:)), data, tstamp ) #undef MPP_RANK_ #define MPP_RANK_ (:,:) -#include +#include #undef MPP_WRITE_ #define MPP_WRITE_ mpp_write_r3D_r8 @@ -1089,7 +1089,7 @@ #define MPP_WRITE_RECORD_ write_record_r8( unit, field, size(data(:,:,:)), data, tstamp) #undef MPP_RANK_ #define MPP_RANK_ (:,:,:) -#include +#include #undef MPP_WRITE_ #define MPP_WRITE_ mpp_write_r4D_r8 @@ -1099,7 +1099,7 @@ #define MPP_WRITE_RECORD_ write_record_r8( unit, field, size(data(:,:,:,:)), data, tstamp) #undef MPP_RANK_ #define MPP_RANK_ (:,:,:,:) -#include +#include #undef MPP_WRITE_ #define MPP_WRITE_ mpp_write_r0D_r4 @@ -1109,7 +1109,7 @@ #define MPP_RANK_ ! #undef MPP_WRITE_RECORD_ #define MPP_WRITE_RECORD_ write_record_r4( unit, field, 1, (/data/), tstamp) -#include +#include #undef MPP_WRITE_ #define MPP_WRITE_ mpp_write_r1D_r4 @@ -1119,7 +1119,7 @@ #define MPP_WRITE_RECORD_ write_record_r4( unit, field, size(data(:)), data, tstamp) #undef MPP_RANK_ #define MPP_RANK_ (:) -#include +#include #undef MPP_WRITE_ #define MPP_WRITE_ mpp_write_r2D_r4 @@ -1129,7 +1129,7 @@ #define MPP_WRITE_RECORD_ write_record_r4( unit, field, size(data(:,:)), data, tstamp ) #undef MPP_RANK_ #define MPP_RANK_ (:,:) -#include +#include #undef MPP_WRITE_ #define MPP_WRITE_ mpp_write_r3D_r4 @@ -1139,7 +1139,7 @@ #define MPP_WRITE_RECORD_ write_record_r4( unit, field, size(data(:,:,:)), data, tstamp) #undef MPP_RANK_ #define MPP_RANK_ (:,:,:) -#include +#include #undef MPP_WRITE_ #define MPP_WRITE_ mpp_write_r4D_r4 @@ -1149,7 +1149,7 @@ #define MPP_WRITE_RECORD_ write_record_r4( unit, field, size(data(:,:,:,:)), data, tstamp) #undef MPP_RANK_ #define MPP_RANK_ (:,:,:,:) -#include +#include subroutine mpp_write_axis( unit, axis ) integer, intent(in) :: unit diff --git a/mpp/include/mpp_read_2Ddecomp.h b/mpp/include/mpp_read_2Ddecomp.fh similarity index 97% rename from mpp/include/mpp_read_2Ddecomp.h rename to mpp/include/mpp_read_2Ddecomp.fh index e11747487b..4526cf4f75 100644 --- a/mpp/include/mpp_read_2Ddecomp.h +++ b/mpp/include/mpp_read_2Ddecomp.fh @@ -108,7 +108,8 @@ end subroutine READ_RECORD_CORE_ - subroutine READ_RECORD_( unit, field, num_words, data, time_level, domain, position, tile_count, start_in, axsiz_in ) + subroutine READ_RECORD_( unit, field, num_words, data, time_level, & + & domain, position, tile_count, start_in, axsiz_in ) !routine that is finally called by all mpp_read routines to perform the read !a non-netCDF record contains: ! field ID @@ -151,7 +152,8 @@ if( .NOT.mpp_file(unit)%read_on_this_pe )return if( .NOT.mpp_file(unit)%initialized ) call mpp_error( FATAL, 'MPP_READ: must first call mpp_read_meta.' ) - if( mpp_file(unit)%format .NE. MPP_NETCDF ) call mpp_error( FATAL, 'Currently dont support non-NetCDF mpp read' ) + if( mpp_file(unit)%format .NE. MPP_NETCDF ) & + call mpp_error( FATAL, 'Currently dont support non-NetCDF mpp read' ) if (.not.PRESENT(time_level)) then tlevel = 0 @@ -215,8 +217,8 @@ end if else if( mpp_file(unit)%io_domain_exist ) then io_domain=>mpp_get_io_domain(domain) - call mpp_get_compute_domain( io_domain, is, ie, js, je, tile_count=tile_count, position=position ) - call mpp_get_global_domain ( io_domain, isg, ieg, jsg, jeg, tile_count=tile_count, position=position ) + call mpp_get_compute_domain(io_domain, is, ie, js, je, tile_count=tile_count, position=position) + call mpp_get_global_domain (io_domain, isg, ieg, jsg, jeg, tile_count=tile_count, position=position) start(1) = is - isg + 1 start(2) = js - jsg + 1 io_domain => NULL() diff --git a/mpp/include/mpp_read_compressed.h b/mpp/include/mpp_read_compressed.fh similarity index 100% rename from mpp/include/mpp_read_compressed.h rename to mpp/include/mpp_read_compressed.fh diff --git a/mpp/include/mpp_read_distributed_ascii.h b/mpp/include/mpp_read_distributed_ascii.fh similarity index 100% rename from mpp/include/mpp_read_distributed_ascii.h rename to mpp/include/mpp_read_distributed_ascii.fh diff --git a/mpp/include/mpp_read_distributed_ascii.inc b/mpp/include/mpp_read_distributed_ascii.inc index 577c024f18..a597cb909b 100644 --- a/mpp/include/mpp_read_distributed_ascii.inc +++ b/mpp/include/mpp_read_distributed_ascii.inc @@ -27,13 +27,13 @@ #define MPP_READ_DISTRIBUTED_ASCII_1D_ mpp_read_distributed_ascii_r1D #undef MPP_TYPE_ #define MPP_TYPE_ real -#include +#include #undef MPP_READ_DISTRIBUTED_ASCII_1D_ #define MPP_READ_DISTRIBUTED_ASCII_1D_ mpp_read_distributed_ascii_i1D #undef MPP_TYPE_ #define MPP_TYPE_ integer -#include +#include subroutine mpp_read_distributed_ascii_a1D(unit,fmt,ssize,data,iostat) integer, intent(in) :: unit diff --git a/mpp/include/mpp_reduce_mpi.h b/mpp/include/mpp_reduce_mpi.fh similarity index 100% rename from mpp/include/mpp_reduce_mpi.h rename to mpp/include/mpp_reduce_mpi.fh diff --git a/mpp/include/mpp_reduce_nocomm.h b/mpp/include/mpp_reduce_nocomm.fh similarity index 100% rename from mpp/include/mpp_reduce_nocomm.h rename to mpp/include/mpp_reduce_nocomm.fh diff --git a/mpp/include/mpp_scatter.h b/mpp/include/mpp_scatter.fh similarity index 97% rename from mpp/include/mpp_scatter.h rename to mpp/include/mpp_scatter.fh index 998723e9e7..4223f79c39 100644 --- a/mpp/include/mpp_scatter.h +++ b/mpp/include/mpp_scatter.fh @@ -27,7 +27,8 @@ subroutine MPP_SCATTER_PELIST_2D_(is, ie, js, je, pelist, array_seg, data, is_root_pe, & ishift, jshift) integer, intent(in) :: is, ie, js, je !< indices of segment array - integer, dimension(:), intent(in) :: pelist! contiguous words from an array of any rank to be passed (avoiding f90 rank conformance check) +!!further, this permits contiguous words from an array of any rank to be passed +!!(avoiding f90 rank conformance check) !!caller is responsible for completion checks (mpp_sync_self) before and after subroutine MPP_TRANSMIT_( put_data, put_len, to_pe, get_data, get_len, from_pe, block, tag, recv_request, & & send_request ) @@ -78,16 +79,17 @@ call MPI_ISEND( put_data, put_len, MPI_TYPE_, to_pe, comm_tag, mpp_comm_private, send_request, error) else cur_send_request = cur_send_request + 1 - if( cur_send_request > max_request ) call mpp_error(FATAL, & - "MPP_TRANSMIT: cur_send_request is greater than max_request, increase mpp_nml request_multiply") + if( cur_send_request > max_request ) & + call mpp_error(FATAL, & + & "MPP_TRANSMIT: cur_send_request is greater than max_request, increase mpp_nml request_multiply") call MPI_ISEND( put_data, put_len, MPI_TYPE_, to_pe, comm_tag, mpp_comm_private, & request_send(cur_send_request), error) endif - if( debug .and. (current_clock.NE.0) )call increment_current_clock( EVENT_SEND, put_len*MPP_TYPE_BYTELEN_ ) - else if( to_pe.EQ.ALL_PES )then !this is a broadcast from from_pe - if( from_pe.LT.0 .OR. from_pe.GE.npes )call mpp_error( FATAL, 'MPP_TRANSMIT: broadcasting from invalid PE.' ) - if( put_len.GT.get_len )call mpp_error( FATAL, 'MPP_TRANSMIT: size mismatch between put_data and get_data.' ) - if( pe.EQ.from_pe )then + if (debug .and. (current_clock.NE.0)) call increment_current_clock(EVENT_SEND, put_len*MPP_TYPE_BYTELEN_) + else if (to_pe.EQ.ALL_PES) then !this is a broadcast from from_pe + if(from_pe.LT.0 .OR. from_pe.GE.npes) call mpp_error(FATAL, 'MPP_TRANSMIT: broadcasting from invalid PE.') + if(put_len.GT.get_len) call mpp_error(FATAL, 'MPP_TRANSMIT: size mismatch between put_data and get_data.') + if(pe.EQ.from_pe)then if( LOC(get_data).NE.LOC(put_data) )then !dir$ IVDEP do i = 1,get_len @@ -125,8 +127,9 @@ recv_request, error ) else cur_recv_request = cur_recv_request + 1 - if( cur_recv_request > max_request ) call mpp_error(FATAL, & - "MPP_TRANSMIT: cur_recv_request is greater than max_request, increase mpp_nml request_multiply") + if( cur_recv_request > max_request ) & + call mpp_error(FATAL, & + "MPP_TRANSMIT: cur_recv_request is greater than max_request, increase mpp_nml request_multiply") call MPI_IRECV( get_data, get_len, MPI_TYPE_, from_pe, comm_tag, mpp_comm_private, & request_recv(cur_recv_request), error ) size_recv(cur_recv_request) = get_len @@ -140,7 +143,8 @@ call MPI_RECV( get_data, get_len, MPI_TYPE_, MPI_ANY_SOURCE, comm_tag, mpp_comm_private, stat, error ) if( debug .and. (current_clock.NE.0) )call increment_current_clock( EVENT_RECV, get_len*MPP_TYPE_BYTELEN_ ) else if( from_pe.EQ.ALL_PES )then - call mpp_error( FATAL, 'MPP_TRANSMIT: from_pe=ALL_PES has ambiguous meaning, and hence is not implemented.' ) + call mpp_error( FATAL, 'MPP_TRANSMIT: from_pe=ALL_PES has ambiguous meaning,' & + & // 'and hence is not implemented.') else if( from_pe.NE.NULL_PE )then !only remaining valid choice is NULL_PE call mpp_error( FATAL, 'MPP_TRANSMIT: invalid from_pe.' ) end if diff --git a/mpp/include/mpp_transmit_nocomm.h b/mpp/include/mpp_transmit_nocomm.fh similarity index 92% rename from mpp/include/mpp_transmit_nocomm.h rename to mpp/include/mpp_transmit_nocomm.fh index 3074971d8f..ca132a4dc8 100644 --- a/mpp/include/mpp_transmit_nocomm.h +++ b/mpp/include/mpp_transmit_nocomm.fh @@ -31,8 +31,9 @@ !! NULL_PE: to disable a put or a get (e.g at boundaries) !! ANY_PE: if remote PE for the put or get is to be unspecific !! ALL_PES: broadcast and collect operations (collect not yet implemented) -!!ideally we would not pass length, but this f77-style call performs better (arrays passed by address, not descriptor) -!!further, this permits contiguous words from an array of any rank to be passed (avoiding f90 rank conformance check) +!!ideally we would not pass length, but this f77-style call performs better +!!(arrays passed by address, not descriptor) further, this permits contiguous +!!words from an array of any rank to be passed (avoiding f90 rank conformance check) !!caller is responsible for completion checks (mpp_sync_self) before and after subroutine MPP_TRANSMIT_( put_data, put_len, to_pe, get_data, get_len, from_pe, block, tag, recv_request, & & send_request ) @@ -80,8 +81,10 @@ end do endif else if( to_pe.EQ.ALL_PES )then !this is a broadcast from from_pe - if( from_pe.LT.0 .OR. from_pe.GE.npes )call mpp_error( FATAL, 'MPP_TRANSMIT: broadcasting from invalid PE.' ) - if( put_len.GT.get_len )call mpp_error( FATAL, 'MPP_TRANSMIT: size mismatch between put_data and get_data.' ) + if( from_pe.LT.0 .OR. from_pe.GE.npes ) & + call mpp_error( FATAL, 'MPP_TRANSMIT: broadcasting from invalid PE.' ) + if( put_len.GT.get_len ) & + call mpp_error( FATAL, 'MPP_TRANSMIT: size mismatch between put_data and get_data.' ) if( pe.EQ.from_pe )then if( LOC(get_data).NE.LOC(put_data) )then !dir$ IVDEP @@ -113,7 +116,8 @@ else if( from_pe.EQ.ANY_PE )then else if( from_pe.EQ.ALL_PES )then - call mpp_error( FATAL, 'MPP_TRANSMIT: from_pe=ALL_PES has ambiguous meaning, and hence is not implemented.' ) + call mpp_error( FATAL, 'MPP_TRANSMIT: from_pe=ALL_PES has ambiguous meaning,' & + & // 'and hence is not implemented.' ) else if( from_pe.NE.NULL_PE )then !only remaining valid choice is NULL_PE call mpp_error( FATAL, 'MPP_TRANSMIT: invalid from_pe.' ) diff --git a/mpp/include/mpp_type_mpi.h b/mpp/include/mpp_type_mpi.fh similarity index 100% rename from mpp/include/mpp_type_mpi.h rename to mpp/include/mpp_type_mpi.fh diff --git a/mpp/include/mpp_type_nocomm.h b/mpp/include/mpp_type_nocomm.fh similarity index 100% rename from mpp/include/mpp_type_nocomm.h rename to mpp/include/mpp_type_nocomm.fh diff --git a/mpp/include/mpp_unstruct_domain.inc b/mpp/include/mpp_unstruct_domain.inc index 7444b82068..a074cc3f03 100644 --- a/mpp/include/mpp_unstruct_domain.inc +++ b/mpp/include/mpp_unstruct_domain.inc @@ -815,7 +815,7 @@ end subroutine mpp_deallocate_domainUG #define mpp_pass_UG_to_SG_2D_ mpp_pass_UG_to_SG_r8_2d #undef mpp_pass_UG_to_SG_3D_ #define mpp_pass_UG_to_SG_3D_ mpp_pass_UG_to_SG_r8_3d -#include +#include #undef MPP_TYPE_ #define MPP_TYPE_ real(r4_kind) @@ -827,7 +827,7 @@ end subroutine mpp_deallocate_domainUG #define mpp_pass_UG_to_SG_2D_ mpp_pass_UG_to_SG_r4_2d #undef mpp_pass_UG_to_SG_3D_ #define mpp_pass_UG_to_SG_3D_ mpp_pass_UG_to_SG_r4_3d -#include +#include #undef MPP_TYPE_ #define MPP_TYPE_ integer(i4_kind) @@ -839,7 +839,7 @@ end subroutine mpp_deallocate_domainUG #define mpp_pass_UG_to_SG_2D_ mpp_pass_UG_to_SG_i4_2d #undef mpp_pass_UG_to_SG_3D_ #define mpp_pass_UG_to_SG_3D_ mpp_pass_UG_to_SG_i4_3d -#include +#include #undef MPP_TYPE_ #define MPP_TYPE_ logical(i4_kind) @@ -851,7 +851,7 @@ end subroutine mpp_deallocate_domainUG #define mpp_pass_UG_to_SG_2D_ mpp_pass_UG_to_SG_l4_2d #undef mpp_pass_UG_to_SG_3D_ #define mpp_pass_UG_to_SG_3D_ mpp_pass_UG_to_SG_l4_3d -#include +#include #undef MPP_GLOBAL_FIELD_UG_2D_ #define MPP_GLOBAL_FIELD_UG_2D_ mpp_global_field2D_ug_r8_2d @@ -863,7 +863,7 @@ end subroutine mpp_deallocate_domainUG #define MPP_GLOBAL_FIELD_UG_5D_ mpp_global_field2D_ug_r8_5d #undef MPP_TYPE_ #define MPP_TYPE_ real(r8_kind) -#include +#include #undef MPP_GLOBAL_FIELD_UG_2D_ #define MPP_GLOBAL_FIELD_UG_2D_ mpp_global_field2D_ug_i8_2d @@ -875,7 +875,7 @@ end subroutine mpp_deallocate_domainUG #define MPP_GLOBAL_FIELD_UG_5D_ mpp_global_field2D_ug_i8_5d #undef MPP_TYPE_ #define MPP_TYPE_ integer(i8_kind) -#include +#include #undef MPP_GLOBAL_FIELD_UG_2D_ #define MPP_GLOBAL_FIELD_UG_2D_ mpp_global_field2D_ug_r4_2d @@ -887,7 +887,7 @@ end subroutine mpp_deallocate_domainUG #define MPP_GLOBAL_FIELD_UG_5D_ mpp_global_field2D_ug_r4_5d #undef MPP_TYPE_ #define MPP_TYPE_ real(r4_kind) -#include +#include #undef MPP_GLOBAL_FIELD_UG_2D_ #define MPP_GLOBAL_FIELD_UG_2D_ mpp_global_field2D_ug_i4_2d @@ -899,5 +899,5 @@ end subroutine mpp_deallocate_domainUG #define MPP_GLOBAL_FIELD_UG_5D_ mpp_global_field2D_ug_i4_5d #undef MPP_TYPE_ #define MPP_TYPE_ integer(i4_kind) -#include +#include !> @} diff --git a/mpp/include/mpp_unstruct_pass_data.h b/mpp/include/mpp_unstruct_pass_data.fh similarity index 100% rename from mpp/include/mpp_unstruct_pass_data.h rename to mpp/include/mpp_unstruct_pass_data.fh diff --git a/mpp/include/mpp_update_domains2D.h b/mpp/include/mpp_update_domains2D.fh similarity index 100% rename from mpp/include/mpp_update_domains2D.h rename to mpp/include/mpp_update_domains2D.fh diff --git a/mpp/include/mpp_update_domains2D_ad.h b/mpp/include/mpp_update_domains2D_ad.fh similarity index 100% rename from mpp/include/mpp_update_domains2D_ad.h rename to mpp/include/mpp_update_domains2D_ad.fh diff --git a/mpp/include/mpp_update_domains2D_nonblock.h b/mpp/include/mpp_update_domains2D_nonblock.fh similarity index 100% rename from mpp/include/mpp_update_domains2D_nonblock.h rename to mpp/include/mpp_update_domains2D_nonblock.fh diff --git a/mpp/include/mpp_update_nest_domains.h b/mpp/include/mpp_update_nest_domains.fh similarity index 100% rename from mpp/include/mpp_update_nest_domains.h rename to mpp/include/mpp_update_nest_domains.fh diff --git a/mpp/include/mpp_util.inc b/mpp/include/mpp_util.inc index 19f911d50e..ee3e3dcc59 100644 --- a/mpp/include/mpp_util.inc +++ b/mpp/include/mpp_util.inc @@ -203,7 +203,7 @@ end subroutine mpp_error_Ra #define _SUBNAME_ mpp_error_ia_ia #define _ARRAY1TYPE_ integer #define _ARRAY2TYPE_ integer -#include +#include #undef _SUBNAME_ #undef _ARRAY1TYPE_ #undef _ARRAY2TYPE_ @@ -211,7 +211,7 @@ end subroutine mpp_error_Ra #define _SUBNAME_ mpp_error_ia_ra #define _ARRAY1TYPE_ integer #define _ARRAY2TYPE_ real -#include +#include #undef _SUBNAME_ #undef _ARRAY1TYPE_ #undef _ARRAY2TYPE_ @@ -219,7 +219,7 @@ end subroutine mpp_error_Ra #define _SUBNAME_ mpp_error_ra_ia #define _ARRAY1TYPE_ real #define _ARRAY2TYPE_ integer -#include +#include #undef _SUBNAME_ #undef _ARRAY1TYPE_ #undef _ARRAY2TYPE_ @@ -227,7 +227,7 @@ end subroutine mpp_error_Ra #define _SUBNAME_ mpp_error_ra_ra #define _ARRAY1TYPE_ real #define _ARRAY2TYPE_ real -#include +#include #undef _SUBNAME_ #undef _ARRAY1TYPE_ #undef _ARRAY2TYPE_ @@ -235,7 +235,7 @@ end subroutine mpp_error_Ra #define _SUBNAME_ mpp_error_ia_is #define _ARRAY1TYPE_ integer #define _ARRAY2TYPE_ integer -#include +#include #undef _SUBNAME_ #undef _ARRAY1TYPE_ #undef _ARRAY2TYPE_ @@ -243,7 +243,7 @@ end subroutine mpp_error_Ra #define _SUBNAME_ mpp_error_ia_rs #define _ARRAY1TYPE_ integer #define _ARRAY2TYPE_ real -#include +#include #undef _SUBNAME_ #undef _ARRAY1TYPE_ #undef _ARRAY2TYPE_ @@ -251,7 +251,7 @@ end subroutine mpp_error_Ra #define _SUBNAME_ mpp_error_ra_is #define _ARRAY1TYPE_ real #define _ARRAY2TYPE_ integer -#include +#include #undef _SUBNAME_ #undef _ARRAY1TYPE_ #undef _ARRAY2TYPE_ @@ -259,7 +259,7 @@ end subroutine mpp_error_Ra #define _SUBNAME_ mpp_error_ra_rs #define _ARRAY1TYPE_ real #define _ARRAY2TYPE_ real -#include +#include #undef _SUBNAME_ #undef _ARRAY1TYPE_ #undef _ARRAY2TYPE_ @@ -267,7 +267,7 @@ end subroutine mpp_error_Ra #define _SUBNAME_ mpp_error_is_ia #define _ARRAY1TYPE_ integer #define _ARRAY2TYPE_ integer -#include +#include #undef _SUBNAME_ #undef _ARRAY1TYPE_ #undef _ARRAY2TYPE_ @@ -275,7 +275,7 @@ end subroutine mpp_error_Ra #define _SUBNAME_ mpp_error_is_ra #define _ARRAY1TYPE_ integer #define _ARRAY2TYPE_ real -#include +#include #undef _SUBNAME_ #undef _ARRAY1TYPE_ #undef _ARRAY2TYPE_ @@ -283,7 +283,7 @@ end subroutine mpp_error_Ra #define _SUBNAME_ mpp_error_rs_ia #define _ARRAY1TYPE_ real #define _ARRAY2TYPE_ integer -#include +#include #undef _SUBNAME_ #undef _ARRAY1TYPE_ #undef _ARRAY2TYPE_ @@ -291,7 +291,7 @@ end subroutine mpp_error_Ra #define _SUBNAME_ mpp_error_rs_ra #define _ARRAY1TYPE_ real #define _ARRAY2TYPE_ real -#include +#include #undef _SUBNAME_ #undef _ARRAY1TYPE_ #undef _ARRAY2TYPE_ @@ -299,7 +299,7 @@ end subroutine mpp_error_Ra #define _SUBNAME_ mpp_error_is_is #define _ARRAY1TYPE_ integer #define _ARRAY2TYPE_ integer -#include +#include #undef _SUBNAME_ #undef _ARRAY1TYPE_ #undef _ARRAY2TYPE_ @@ -307,7 +307,7 @@ end subroutine mpp_error_Ra #define _SUBNAME_ mpp_error_is_rs #define _ARRAY1TYPE_ integer #define _ARRAY2TYPE_ real -#include +#include #undef _SUBNAME_ #undef _ARRAY1TYPE_ #undef _ARRAY2TYPE_ @@ -315,7 +315,7 @@ end subroutine mpp_error_Ra #define _SUBNAME_ mpp_error_rs_is #define _ARRAY1TYPE_ real #define _ARRAY2TYPE_ integer -#include +#include #undef _SUBNAME_ #undef _ARRAY1TYPE_ #undef _ARRAY2TYPE_ @@ -323,7 +323,7 @@ end subroutine mpp_error_Ra #define _SUBNAME_ mpp_error_rs_rs #define _ARRAY1TYPE_ real #define _ARRAY2TYPE_ real -#include +#include #undef _SUBNAME_ #undef _ARRAY1TYPE_ #undef _ARRAY2TYPE_ diff --git a/mpp/include/mpp_write.h b/mpp/include/mpp_write.fh similarity index 100% rename from mpp/include/mpp_write.h rename to mpp/include/mpp_write.fh diff --git a/mpp/include/mpp_write_2Ddecomp.h b/mpp/include/mpp_write_2Ddecomp.fh similarity index 100% rename from mpp/include/mpp_write_2Ddecomp.h rename to mpp/include/mpp_write_2Ddecomp.fh diff --git a/mpp/include/mpp_write_compressed.h b/mpp/include/mpp_write_compressed.fh similarity index 100% rename from mpp/include/mpp_write_compressed.h rename to mpp/include/mpp_write_compressed.fh diff --git a/mpp/include/mpp_write_unlimited_axis.h b/mpp/include/mpp_write_unlimited_axis.fh similarity index 100% rename from mpp/include/mpp_write_unlimited_axis.h rename to mpp/include/mpp_write_unlimited_axis.fh diff --git a/mpp/include/system_clock.h b/mpp/include/system_clock.fh similarity index 100% rename from mpp/include/system_clock.h rename to mpp/include/system_clock.fh diff --git a/mpp/mpp.F90 b/mpp/mpp.F90 index 30cfc7b5cc..d429abb3f9 100644 --- a/mpp/mpp.F90 +++ b/mpp/mpp.F90 @@ -1341,7 +1341,7 @@ module mpp_mod namelist /mpp_nml/ etc_unit_is_stderr, request_multiply, mpp_record_timing_data, sync_all_clocks contains -#include +#include #include #include diff --git a/test_fms/mpp/test_system_clock.F90 b/test_fms/mpp/test_system_clock.F90 index 92cd9a05da..434353e9ad 100644 --- a/test_fms/mpp/test_system_clock.F90 +++ b/test_fms/mpp/test_system_clock.F90 @@ -33,7 +33,7 @@ module include_files_mod use platform_mod logical :: first_call_system_clock_mpi=.TRUE. contains -#include "../../mpp/include/system_clock.h" +#include "../../mpp/include/system_clock.fh" end module include_files_mod program test_system_clock