simplify real precision

Author: scivision

CITATION.cff

@@ -5,6 +5,6 @@ authors:
     given-names: Michael
     orcid: https://orcid.org/0000-0002-1637-6526
 title: h5fortran
-version: 1.1.5
+version: 1.2.0
 doi: 10.5281/zenodo.4589680
-date-released: 2021-11-08
+date-released: 2021-11-21

CMakeLists.txt

@@ -11,14 +11,12 @@ HOMEPAGE_URL https://github.com/geospace-code/maptran3d
 
 include(CTest)
 
-include(cmake/compilers.cmake)
-
-if(realbits EQUAL 32)
-  set(wp_real "wp=>real32")
-else()
-  set(wp_real "wp=>real64")
+if(NOT realbits)
+  set(realbits 32)
 endif()
 
+include(cmake/compilers.cmake)
+
 # --- Maptran library
 add_library(maptran)
 target_include_directories(maptran PUBLIC

README.md

@@ -9,24 +9,21 @@ Similar to Python
 and Matlab
 [Matmap3d](https://github.com/geospace-code/matmap3d).
 
-## Install
+Default real precision is double precision (64 bit).
 
-Requires Fortran 2008 compiler, such as `gfortran`, `ifort`, PGI, `nagfor`, `flang`, Cray, IBM XL, etc.
-Use CMake or Meson to build the suite, which creates `libmaptran.a` or similar.
-Compile-time polymorphism enabled by configuring with one of:
-
-* `-Drealbits=32`
-* `-Drealbits=64`
+```sh
+cmake -B build
+cmake --build build
+```
 
-The large real values typical of map coordinates can lead to large error with 32-bit reals.
-64-bit real is the default.
+Set 32-bit real by:
 
 ```sh
-cmake --preset=ninja
+cmake -B build -Drealbits=32
 cmake --build build
 ```
 
-## Usage
+which produces build/libmaptran.a or similar.
 
 The modern Fortran API is simple like PyMap3D and Matlab Mapping Toolbox.
 `elemental` procedures are used throughout to enable seamless support of scalar or array coordinate inputs.
@@ -38,7 +35,7 @@ call geodetic2ecef(lat,lon,alt, x,y,z)
 call geodetic2aer(lat,lon,alt, observer_lat, observer_lon, observer_alt)
 ```
 
-### Functions
+## Functions
 
 Popular mapping toolbox functions ported to Fortran include the
 following, where the source coordinate system (before the "2") is
@@ -61,7 +58,7 @@ Abbreviations:
 * [ENU: East North Up](https://en.wikipedia.org/wiki/Axes_conventions#Ground_reference_frames:_ENU_and_NED)
 * [NED: North East Down](https://en.wikipedia.org/wiki/North_east_down)
 
-### Caveats
+## Caveats
 
 * Atmospheric effects neglected in all functions.
 * Planetary perturbations and nutation etc. not fully considered.

cmake/compilers.cmake

@@ -1,13 +1,15 @@
 if(CMAKE_Fortran_COMPILER_ID MATCHES "^Intel")
   add_compile_options(
+  -warn -traceback -heap-arrays
   $<IF:$<BOOL:${WIN32}>,/QxHost,-xHost>
-  "$<$<COMPILE_LANGUAGE:Fortran>:-warn;-traceback;-heap-arrays>"
+  "$<$<CONFIG:Debug,RelWithDebInfo>:-check>"
+  "$<IF:$<EQUAL:${realbits},32>,,-r8>"
   )
 elseif(CMAKE_Fortran_COMPILER_ID STREQUAL GNU)
-  add_compile_options(-mtune=native -Wall -Wextra
-  "$<$<COMPILE_LANGUAGE:Fortran>:-fimplicit-none>"
-  "$<$<AND:$<COMPILE_LANGUAGE:Fortran>,$<CONFIG:Debug>>:-fcheck=all;-Werror=array-bounds>"
+  add_compile_options(-mtune=native -Wall -fimplicit-none
+  "$<$<CONFIG:Debug,RelWithDebInfo>:-fcheck=all;-Werror=array-bounds>"
+  "$<IF:$<EQUAL:${realbits},32>,,-fdefault-real-8>"
   )
 elseif(CMAKE_Fortran_COMPILER_ID STREQUAL NAG)
-  add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:-f2018;-C;-colour;-gline;-nan;-info;-u>")
+  add_compile_options(-f2018 -C -colour -gline -nan -info -u)
 endif()

codemeta.json

@@ -4,11 +4,11 @@
     "license": "https://spdx.org/licenses/BSD-2-Clause",
     "codeRepository": "https://github.com/geospace-code/maptran3d",
     "contIntegration": "https://github.com/geospace-code/maptran3d/actions",
-    "dateModified": "2021-07-18",
+    "dateModified": "2021-11-21",
     "downloadUrl": "https://github.com/geospace-code/maptran3d/releases",
     "issueTracker": "https://github.com/geospace-code/maptran3d/issues",
     "name": "maptran3d",
-    "version": "1.1.5",
+    "version": "1.2.0",
     "identifier": "10.5281/zenodo.4589680",
     "description": "Fortran coordinate transforms and geodesy",
     "applicationCategory": "geodesy",

meson.build

@@ -9,11 +9,6 @@ elif fc.get_id() == 'intel-cl'
   add_project_arguments('/fpp', '/heap-arrays', language : 'fortran')
 endif
 
-wp_real = get_option('realbits')=='32' ? 'wp=>real32' : 'wp=>real64'
-
-wp_conf = configuration_data()
-wp_conf.set('wp_real', wp_real)
-
 subdir('src')
 # --- Maptran library
 maptran = library('maptran',

meson_options.txt

@@ -1,8 +1,5 @@
-configure_file(maptran.in.f90 maptran.f90 @ONLY)
-configure_file(vallado.in.f90 vallado.f90 @ONLY)
-
 target_sources(maptran PRIVATE
-${CMAKE_CURRENT_BINARY_DIR}/maptran.f90
-${CMAKE_CURRENT_BINARY_DIR}/vallado.f90
+maptran.f90
+vallado.f90
 aer.f90 ecef.f90 enu.f90 sphere.f90 utils.f90
 )

src/CMakeLists.txt

@@ -21,7 +21,7 @@
 !! az: azimuth clockwise from local north
 !! el: elevation angle above local horizon
 
-real(wp) :: east, north, up
+real :: east, north, up
 
 call ecef2enu(x, y, z, lat0, lon0, alt0, east, north, up, spheroid, deg)
 call enu2aer(east, north, up, az, el, slantRange, deg)
@@ -45,7 +45,7 @@
 ! -------
 ! x,y,z: Earth Centered Earth Fixed (ECEF) coordinates of test point (meters)
 
-real(wp) :: x0,y0,z0, e,n,u,dx,dy,dz
+real :: x0,y0,z0, e,n,u,dx,dy,dz
 
 !> Origin of the local system in geocentric coordinates.
 call geodetic2ecef(lat0, lon0, alt0,x0, y0, z0, spheroid,deg)
@@ -77,7 +77,7 @@
 ! az: azimuth clockwise from local north
 ! el: elevation angle above local horizon
 
-real(wp) :: east,north,up
+real :: east,north,up
 
 
 call geodetic2enu(lat, lon, alt, lat0, lon0, alt0, east,north,up, spheroid, deg)
@@ -102,7 +102,7 @@
 !!
 !! *  lat1,lon1,alt1: geodetic coordinates of test points (degrees,degrees,meters)
 
-real(wp) :: x,y,z
+real :: x,y,z
 
 call aer2ecef(az, el, slantRange, lat0, lon0, alt0, x, y, z, spheroid, deg)
 

src/aer.f90

@@ -11,7 +11,7 @@
 !! You, Rey-Jer. (2000). Transformation of Cartesian to Geodetic Coordinates without Iterations.
 !! Journal of Surveying Engineering. doi: 10.1061/(ASCE)0733-9453
 
-real(wp) :: ea, eb, r, E, u, Q, huE, Beta, eps, sinBeta, cosBeta
+real :: ea, eb, r, E, u, Q, huE, Beta, eps, sinBeta, cosBeta
 type(Ellipsoid) :: ell
 logical :: d, inside
 
@@ -61,7 +61,7 @@
   alt = hypot(z - eb * sinBeta, Q - ea * cosBeta)
 
   !> inside ellipsoid?
-  inside = x**2 / ea**2 + y**2 / ea**2 + z**2 / eb**2 < 1._wp
+  inside = x**2 / ea**2 + y**2 / ea**2 + z**2 / eb**2 < 1
   if (inside) alt = -alt
 endif
 
@@ -91,7 +91,7 @@
 !!
 !! * x,y,z:  ECEF coordinates of test point(s) (meters)
 
-real(wp) :: N, sinLat, cosLat, cosLon, sinLon, lat, lon
+real :: N, sinLat, cosLat, cosLon, sinLon, lat, lon
 type(Ellipsoid) :: ell
 logical :: d
 
@@ -166,7 +166,7 @@
 ! -------
 ! x,y,z: Earth Centered Earth Fixed (ECEF) coordinates of test point (meters)
 
-real(wp) :: x0,y0,z0,dx,dy,dz
+real :: x0,y0,z0,dx,dy,dz
 
 call geodetic2ecef(lat0, lon0, alt0, x0, y0, z0, spheroid, deg)
 call enu2uvw(e, n, u, lat0, lon0, dx, dy, dz, deg)
@@ -191,7 +191,7 @@
 !!
 !! * e,n,u:  East, North, Up coordinates of test points (meters)
 
-real(wp) :: x0,y0,z0
+real :: x0,y0,z0
 
 call geodetic2ecef(lat0, lon0, alt0, x0,y0,z0, spheroid,deg)
 call ecef2enuv(x - x0, y - y0, z - z0, lat0, lon0, east, north, up, deg)
@@ -211,7 +211,7 @@
 !!
 !! * east,north,Up:  East, North, Up vector
 
-real(wp) :: t, lat0, lon0
+real :: t, lat0, lon0
 logical :: d
 
 d=.true.
@@ -231,9 +231,9 @@
 end procedure ecef2enuv
 
 
-elemental real(wp) function radius_normal(lat,E)
+elemental real function radius_normal(lat,E)
 
-real(wp), intent(in) :: lat
+real, intent(in) :: lat
 type(Ellipsoid), intent(in) :: E
 
 !> singularity  pi/2 issue is inherent to real32