Merge pull request #13 from sourceryinstitute/rm-macros

Update build instructions & remove macros used with nagfor versions < 7.1

Author: rouson

README.md

@@ -57,7 +57,8 @@ Downloading, Building, and Running Examples
 2. The [Fortran Package Manager].
 3. _Optional_: [OpenCoarrays] for parallel execution with the GNU Fortran compiler.
 
-Recent versions of the Cray, Intel, GNU, and NAG compilers suffice.  Assert was developed primarily with `gfortran` 11.1.0 and `nagfor` 7.0 Build 7044.
+Assert was developed primarily with `gfortran` 11.2.0 and `nagfor` 7.1.
+Recent versions of the Cray and Intel compilers should also suffice.  
 
 ### Downloading, building, and testing
 
@@ -81,8 +82,12 @@ fpm test --compiler nagfor --flag -fpp
 #### Building and testing: multi-image (parallel) execution
 With `gfortran` and OpenCoarrays installed,
 ```
-fpm test --compiler caf --runner "cafrun -n 2" designed-to-terminate-normally
-fpm test --compiler caf --runner "cafrun -n 2" designed-to-error-terminate
+fpm test --compiler caf --runner "cafrun -n 2"
+```
+To build and test with the Numerical Algorithms Group (NAG) Fortran compiler version
+7.1 or later, use
+```
+fpm test --compiler=nagfor --flag="-coarray=cosmp -fpp -f2018"
 ```
 
 For documentation on using Assert with other compilers, please submit an issue or pull request.  

fpm.toml

@@ -3,4 +3,4 @@ version = "1.0.0"
 license = "BSD"
 author = ["Damian Rouson"]
 maintainer = "[email protected]"
-copyright = "2021 Sourcery Institute"
+copyright = "2021-2022 Sourcery Institute"

test/unit-tests/designed-to-error-terminate.f90

@@ -32,32 +32,18 @@ program designed_to_error_terminate
 
 contains
 
-  pure function both(lhs,rhs) result(lhs_or_rhs)
-    logical, intent(in) :: lhs,rhs
-    logical lhs_or_rhs
+  pure function and(lhs,rhs) result(lhs_and_rhs)
+    logical, intent(in) :: lhs, rhs
+    logical lhs_and_rhs
 
-    lhs_or_rhs = lhs .and. rhs
+    lhs_and_rhs = lhs .and. rhs
 
   end function
 
   subroutine co_all(boolean)
     logical, intent(inout) :: boolean
 
-#ifndef NAGFOR
-    call co_reduce(boolean, both)
-#else
-    ! Because parallel NAG runs happen in shared memory and because this function is called only once in 
-    ! one test, a simplistic, non-scalable reduction algorithm suffices until co_reduce is supported.
-    block
-      logical, save :: my_boolean[*]
-      integer i
-
-      my_boolean = boolean
-      do i=1,num_images()
-        my_boolean = my_boolean .and.  my_boolean[i]
-      end do
-    end block
-#endif
+    call co_reduce(boolean, and)
 
   end subroutine