From 83035a1c09d352eb92be8232dc146cdeab98a157 Mon Sep 17 00:00:00 2001 From: schnetter Date: Sat, 22 May 2004 14:06:17 +0000 Subject: Rename module cctk_Malloc to prevent name clash git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/Fortran/trunk@11 51d2df92-0e4f-0410-a727-bd43d766d6b6 --- src/cctk.F90 | 2 +- src/cctk_Malloc.F90 | 47 ----------------------------------------------- src/cctk_Malloc1.F90 | 47 +++++++++++++++++++++++++++++++++++++++++++++++ src/make.code.defn | 2 +- 4 files changed, 49 insertions(+), 49 deletions(-) delete mode 100644 src/cctk_Malloc.F90 create mode 100644 src/cctk_Malloc1.F90 diff --git a/src/cctk.F90 b/src/cctk.F90 index 396650e..6e86dc9 100644 --- a/src/cctk.F90 +++ b/src/cctk.F90 @@ -33,7 +33,7 @@ module cctk use cctk_IOMethods use cctk_Interp use cctk_Main - use cctk_Malloc + use cctk_Malloc1 use cctk_MemAlloc use cctk_Misc implicit none diff --git a/src/cctk_Malloc.F90 b/src/cctk_Malloc.F90 deleted file mode 100644 index 55d2775..0000000 --- a/src/cctk_Malloc.F90 +++ /dev/null @@ -1,47 +0,0 @@ -/*@@ - @file $RCSfile$ - @author $Author$ - @date $Date$ - @desc - Fortran 90 interface declarations for the routines - which have their C declarations in cctk_Malloc.h - @enddesc - @version $Header$ -@@*/ - -#include "cctk.h" - -module cctk_Malloc - implicit none - - interface - - subroutine CCTK_MemStat - implicit none - end subroutine CCTK_MemStat - - subroutine CCTK_TotalMemory (amount) - implicit none - integer amount - end subroutine CCTK_TotalMemory - - subroutine CCTK_MemTicketCash (diff, this_ticket) - implicit none - integer diff - integer this_ticket - end subroutine CCTK_MemTicketCash - - subroutine CCTK_MemTicketRequest (ticket) - implicit none - integer ticket - end subroutine CCTK_MemTicketRequest - - subroutine CCTK_MemTicketDelete (ierr, this_ticket) - implicit none - integer ierr - integer this_ticket - end subroutine CCTK_MemTicketDelete - - end interface - -end module cctk_Malloc diff --git a/src/cctk_Malloc1.F90 b/src/cctk_Malloc1.F90 new file mode 100644 index 0000000..002668f --- /dev/null +++ b/src/cctk_Malloc1.F90 @@ -0,0 +1,47 @@ +/*@@ + @file $RCSfile$ + @author $Author$ + @date $Date$ + @desc + Fortran 90 interface declarations for the routines + which have their C declarations in cctk_Malloc.h + @enddesc + @version $Header$ +@@*/ + +#include "cctk.h" + +module cctk_Malloc1 + implicit none + + interface + + subroutine CCTK_MemStat + implicit none + end subroutine CCTK_MemStat + + subroutine CCTK_TotalMemory (amount) + implicit none + integer amount + end subroutine CCTK_TotalMemory + + subroutine CCTK_MemTicketCash (diff, this_ticket) + implicit none + integer diff + integer this_ticket + end subroutine CCTK_MemTicketCash + + subroutine CCTK_MemTicketRequest (ticket) + implicit none + integer ticket + end subroutine CCTK_MemTicketRequest + + subroutine CCTK_MemTicketDelete (ierr, this_ticket) + implicit none + integer ierr + integer this_ticket + end subroutine CCTK_MemTicketDelete + + end interface + +end module cctk_Malloc1 diff --git a/src/make.code.defn b/src/make.code.defn index 4c12721..59e5590 100644 --- a/src/make.code.defn +++ b/src/make.code.defn @@ -26,7 +26,7 @@ SRCS = cctk.F90 \ cctk_IOMethods.F90 \ cctk_Interp.F90 \ cctk_Main.F90 \ - cctk_Malloc.F90 \ + cctk_Malloc1.F90 \ cctk_MemAlloc.F90 \ cctk_Misc.F90 \ util_Table.F90 -- cgit v1.2.3