From ca220aaa32ccbc67f5c1ddde9b6893d7927432f1 Mon Sep 17 00:00:00 2001
From: Tom Clune <Tom.Clune@nasa.gov>
Date: Tue, 2 Jul 2019 12:47:32 -0400
Subject: [PATCH] Fixes build issue due to duplicate module names.

The two files in this commit both declared modules of the same name.
The modules are identical in both files, so the order of the build
only matters in so far as they cannot build at the same time.

Intel was occasionally generating obscure internal compiler errors.
These are never wrong, but I don't think Intel really wants to suport
this, so how to report?
---
 GMAO_pFIO/pfio_collective_demo.F90 | 14 +++++++-------
 GMAO_pFIO/pfio_server_demo.F90     | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/GMAO_pFIO/pfio_collective_demo.F90 b/GMAO_pFIO/pfio_collective_demo.F90
index 2696826c..523c749c 100644
--- a/GMAO_pFIO/pfio_collective_demo.F90
+++ b/GMAO_pFIO/pfio_collective_demo.F90
@@ -9,7 +9,7 @@
 #define _RETURN(A)   if(present(rc)) rc=A; return
 #include "unused_dummy.H"
 
-module CLI
+module CLI_collective
    use pFIO_ThrowMod
    use pFIO_StringVectorMod
    implicit none
@@ -117,10 +117,10 @@ end function parse_vars
    end subroutine process_command_line
    
 
-end module CLI
+end module CLI_collective
 
-module FakeExtDataMod
-   use CLI
+module FakeExtDataMod_collective
+   use CLI_collective
    use pFIO
    use pFIO_StringVectorMod
    use, intrinsic :: iso_fortran_env, only: REAL32
@@ -293,14 +293,14 @@ subroutine finalize(this)
       call this%c%terminate()
    end subroutine finalize
 
-end module FakeExtDataMod
+end module FakeExtDataMod_collective
 
 program main
    use, intrinsic :: iso_fortran_env, only: REAL32
    use mpi
    use pFIO
-   use CLI
-   use FakeExtDataMod
+   use CLI_collective
+   use FakeExtDataMod_collective
    use pFIO_ThrowMod
    implicit none
 
diff --git a/GMAO_pFIO/pfio_server_demo.F90 b/GMAO_pFIO/pfio_server_demo.F90
index 977ff614..56c60409 100644
--- a/GMAO_pFIO/pfio_server_demo.F90
+++ b/GMAO_pFIO/pfio_server_demo.F90
@@ -9,7 +9,7 @@
 #define _RETURN(A)   if(present(rc)) rc=A; return
 #include "unused_dummy.H"
 
-module CLI
+module CLI_server
    use pFIO_ThrowMod
    use pFIO_StringVectorMod
    implicit none
@@ -117,10 +117,10 @@ end function parse_vars
    end subroutine process_command_line
    
 
-end module CLI
+end module CLI_serve
 
-module FakeExtDataMod
-   use CLI
+module FakeExtDataMod_server
+   use CLI_server
    use pFIO
    use pFIO_StringVectorMod
    use, intrinsic :: iso_fortran_env, only: REAL32
@@ -262,14 +262,14 @@ subroutine finalize(this)
       call this%c%terminate()
    end subroutine finalize
 
-end module FakeExtDataMod
+end module FakeExtDataMod_server
 
 program main
    use, intrinsic :: iso_fortran_env, only: REAL32
    use mpi
    use pFIO
-   use CLI
-   use FakeExtDataMod
+   use CLI_server
+   use FakeExtDataMod_server
    use pFIO_ThrowMod
    implicit none