Merge pull request #7 from GEOSproto/feature/fix-module-name-duplication

Fixes #6 : build issue due to duplicate module names.
GEOS-ESM · Jul 2, 2019 · 046b308 · 046b308
2 parents 65b3c59 + ca220aa
commit 046b308
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git 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
@@ -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