Commit a0c28258 authored by Thomas Jahns's avatar Thomas Jahns 🤸
Browse files

Rename src/ppm/scales_ppm_base.f90 to src/core/ppm_base.f90.

* Also rename corresponding C sources.
parent 1d3eda90
......@@ -47,7 +47,7 @@ dnl we need 2.64 because the LANG macros use autom4te properties only
dnl available since sometime in 2.63b
AC_PREREQ([2.64])
AC_INIT([ppm],[0.0.1pre1],[jahns@dkrz.de])
AC_CONFIG_SRCDIR([src/ppm/core.c])
AC_CONFIG_SRCDIR([src/core/core.c])
AC_CONFIG_AUX_DIR([config])
AC_CANONICAL_HOST
AM_INIT_AUTOMAKE([1.10 foreign])
......
......@@ -31,7 +31,7 @@
if FC_MOD_UPPERCASE
PPM_MOD_NAME=SCALES_PPM
GRAPH_PARTITION_MPI_MOD_NAME=GRAPH_PARTITION_MPI
SCALES_PPM_BASE_MOD_NAME=SCALES_PPM_BASE
PPM_BASE_MOD_NAME=PPM_BASE
PPM_EXTENTS_MOD_NAME=PPM_EXTENTS
UNIFORM_PARTITION_MOD_NAME=UNIFORM_PARTITION
GENERAL_BLOCK_DECOMPOSITION_MOD_NAME=GENERAL_BLOCK_DECOMPOSITION
......@@ -48,7 +48,7 @@ SOLVER_ALL_MOD_NAME=SOLVER_ALL
else
PPM_MOD_NAME=scales_ppm
GRAPH_PARTITION_MPI_MOD_NAME=graph_partition_mpi
SCALES_PPM_BASE_MOD_NAME=scales_ppm_base
PPM_BASE_MOD_NAME=ppm_base
PPM_EXTENTS_MOD_NAME=ppm_extents
UNIFORM_PARTITION_MOD_NAME=uniform_partition
GENERAL_BLOCK_DECOMPOSITION_MOD_NAME=general_block_decomposition
......@@ -76,9 +76,9 @@ $(GRAPH_PARTITION_MPI_MOD_NAME).$(FCMODEXT): \
../../src/$(GRAPH_PARTITION_MPI_MOD_NAME).$(FCMODEXT)
$(LN_S) ../../src/$(GRAPH_PARTITION_MPI_MOD_NAME).$(FCMODEXT) .
$(SCALES_PPM_BASE_MOD_NAME).$(FCMODEXT): \
../../src/$(SCALES_PPM_BASE_MOD_NAME).$(FCMODEXT)
$(LN_S) ../../src/$(SCALES_PPM_BASE_MOD_NAME).$(FCMODEXT) .
$(PPM_BASE_MOD_NAME).$(FCMODEXT): \
../../src/$(PPM_BASE_MOD_NAME).$(FCMODEXT)
$(LN_S) ../../src/$(PPM_BASE_MOD_NAME).$(FCMODEXT) .
$(PPM_EXTENTS_MOD_NAME).$(FCMODEXT): \
../../src/$(PPM_EXTENTS_MOD_NAME).$(FCMODEXT)
......@@ -124,7 +124,7 @@ $(SOLVER_ALL_MOD_NAME).$(FCMODEXT): ../../src/$(SOLVER_ALL_MOD_NAME).$(FCMODEXT)
$(LN_S) ../../src/$(SOLVER_ALL_MOD_NAME).$(FCMODEXT) .
include_HEADERS=$(PPM_MOD_NAME).$(FCMODEXT) \
$(SCALES_PPM_BASE_MOD_NAME).$(FCMODEXT) \
$(PPM_BASE_MOD_NAME).$(FCMODEXT) \
$(PPM_EXTENTS_MOD_NAME).$(FCMODEXT) \
$(UNIFORM_PARTITION_MOD_NAME).$(FCMODEXT) \
$(GENERAL_BLOCK_DECOMPOSITION_MOD_NAME).$(FCMODEXT) \
......
......@@ -38,11 +38,10 @@ AM_CFLAGS = $(MPI_C_INCLUDE) -I$(top_srcdir)/include -I../include \
lib_LIBRARIES=libscalesppm.a
libscalesppm_a_SOURCES=ppm/core.c ppm/scales_ppm.f90 \
libscalesppm_a_SOURCES=ppm/scales_ppm.f90 \
ppm/uniform_partition.f90 \
ppm/general_block_decomposition.f90 \
ppm/statistics.f90 \
ppm/scales_ppm_base.f90 \
ppm/strided_extents.f90 ppm/strided_extents_c.c \
solver/solver_public.f90 \
solver/solver_internal.f90 \
......@@ -53,6 +52,8 @@ libscalesppm_a_SOURCES=ppm/core.c ppm/scales_ppm.f90 \
solver/preconditioners.f90 \
solver/solver_all.f90 \
\
core/core.c core/core.h \
core/ppm_base.f90 \
core/ppm_extents.f90 core/ppm_extents_c.c \
core/qsort_r.c core/qsort_fwrap.c core/mo_kind.f90
......
......@@ -43,10 +43,10 @@
#include <mpi.h>
#include "cfortran.h"
#include "ppm/core.h"
#include "core/core.h"
void
scales_ppm_set_mpi_abort_handler(MPI_Comm comm)
ppm_set_mpi_abort_handler(MPI_Comm comm)
{
MPI_Errhandler errh;
if (MPI_Comm_create_errhandler((MPI_Comm_errhandler_fn *)abort,
......@@ -57,7 +57,7 @@ scales_ppm_set_mpi_abort_handler(MPI_Comm comm)
}
void
scales_ppm_set_mpi_abort_handler_fwrap(MPI_Fint *comm_f)
ppm_set_mpi_abort_handler_fwrap(MPI_Fint *comm_f)
{
#ifdef HAVE_MPI_COMM_F2C
MPI_Comm comm_c = MPI_Comm_f2c((MPI_Fint)*comm_f);
......@@ -68,7 +68,7 @@ scales_ppm_set_mpi_abort_handler_fwrap(MPI_Fint *comm_f)
}
FCALLSCSUB1(scales_ppm_set_mpi_abort_handler_fwrap, SET_MPI_ABORT_HANDLER,
FCALLSCSUB1(ppm_set_mpi_abort_handler_fwrap, SET_MPI_ABORT_HANDLER,
set_mpi_abort_handler, PVOID)
......
......@@ -40,7 +40,7 @@
!! contains methods to write simple netCDF files for a single array
MODULE ncdf_dump
USE mo_kind, ONLY: dp, i4, sp
USE scales_ppm_base, ONLY: assertion, abort_ppm
USE ppm_base, ONLY: assertion, abort_ppm
IMPLICIT NONE
INCLUDE 'netcdf.inc'
PRIVATE
......
! scales_ppm_base.f90 --- Fortran 90 interface to core functions
! ppm_base.f90 --- Fortran 90 interface to core functions
!
! Copyright (C) 2010 Thomas Jahns <jahns@dkrz.de>
!
......@@ -42,7 +42,7 @@
!
! Code:
!
MODULE scales_ppm_base
MODULE ppm_base
IMPLICIT NONE
#ifdef USE_MPI
INCLUDE 'mpif.h'
......@@ -90,7 +90,7 @@ CONTAINS
END IF
END SUBROUTINE assertion
END MODULE scales_ppm_base
END MODULE ppm_base
!
! Local Variables:
! license-project-url: "https://www.dkrz.de/redmine/projects/show/scales-ppm"
......
......@@ -44,7 +44,7 @@
MODULE general_block_decomposition
USE ppm_extents, ONLY: extent, extent_start, extent_end, &
extent_size, rebased_extent
USE scales_ppm_base, ONLY: assertion
USE ppm_base, ONLY: assertion
IMPLICIT NONE
PRIVATE
PUBLIC :: gbd_refine_2d
......
......@@ -44,7 +44,7 @@
!
MODULE graph_partition_mpi
USE iso_c_binding, ONLY: c_int, c_float
USE scales_ppm_base, ONLY: abort_ppm
USE ppm_base, ONLY: abort_ppm
IMPLICIT NONE
PRIVATE
INCLUDE 'mpif.h'
......
! graph_partition_serial.f90 --- wrapper for single task graph partitioner
!
! Copyright (C) 2011 Thomas Jahns <jahns@dkrz.de>
!
! Version: 1.0
! Keywords: graph partitioning
! Author: Thomas Jahns <jahns@dkrz.de>
! Maintainer: Thomas Jahns <jahns@dkrz.de>
! URL: https://www.dkrz.de/redmine/projects/show/scales-ppm
!
! Redistribution and use in source and binary forms, with or without
! modification, are permitted provided that the following conditions are
! met:
!
! Redistributions of source code must retain the above copyright notice,
! this list of conditions and the following disclaimer.
!
! Redistributions in binary form must reproduce the above copyright
! notice, this list of conditions and the following disclaimer in the
! documentation and/or other materials provided with the distribution.
!
! Neither the name of the DKRZ GmbH nor the names of its contributors
! may be used to endorse or promote products derived from this software
! without specific prior written permission.
!
! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
! IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
! TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
! PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
! OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
! EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
! PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
! PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
! LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
! NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
! SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
!
! Commentary:
!
!
!
! Code:
!
MODULE graph_partition_serial
USE iso_c_binding, ONLY: c_int, c_float
USE scales_ppm_base, ONLY: abort_ppm, assertion
USE ppm_base, ONLY: abort_ppm, assertion
#include <ppm.inc>
EXTERNAL :: METIS_mCPartGraphKway
EXTERNAL :: METIS_PartGraphKway
......
......@@ -43,7 +43,7 @@
! Code:
!
MODULE scales_ppm
USE scales_ppm_base, ONLY: abort_ppm
USE ppm_base, ONLY: abort_ppm
USE ppm_extents, ONLY: extent, extent_size, extent_end, &
extent_start, rebased_extent, &
extent_set_iinterval, extent_from_iinterval, char, iinterval, &
......
MODULE strided_extents
USE scales_ppm_base, ONLY: abort_ppm, assertion
USE ppm_base, ONLY: abort_ppm, assertion
USE ppm_extents, ONLY: extent, extent_size, extent_start, &
extent_end, OPERATOR(==)
IMPLICIT NONE
......
......@@ -42,7 +42,7 @@
! Code:
!
MODULE uniform_partition
USE scales_ppm_base, ONLY: abort_ppm
USE ppm_base, ONLY: abort_ppm
USE ppm_extents, ONLY: extent, extent_size, extent_start
USE mo_kind, ONLY: i8
IMPLICIT NONE
......
......@@ -45,7 +45,7 @@ MODULE linear_algebra
USE mo_kind, ONLY: wp, dp
USE ppm_extents, ONLY: extent_type => extent, extent_start, &
extent_end, extent_size
USE scales_ppm_base, ONLY: abort_ppm
USE ppm_base, ONLY: abort_ppm
IMPLICIT NONE
......
......@@ -44,7 +44,7 @@ MODULE preconditioners
USE solver_public
USE solver_internal
USE mo_kind, ONLY: wp, dp
USE scales_ppm_base, ONLY: abort_ppm
USE ppm_base, ONLY: abort_ppm
USE ppm_extents, ONLY: extent_start, extent_end, extent_size, extent_type => extent
IMPLICIT NONE
......@@ -545,8 +545,6 @@ MODULE preconditioners
! Check if a certain preconditioner is already prepared
FUNCTION precond_prepared(preconditioner) RESULT(ans)
USE scales_ppm_base, ONLY: abort_ppm
INTEGER, INTENT(IN) :: preconditioner
LOGICAL :: ans
......
......@@ -56,7 +56,7 @@ MODULE solver_all
FUNCTION solve(A, b, x, ext_x, exchange, tol_opt, maxiter_opt) RESULT(kiter)
USE solver_internal
USE ppm_extents, ONLY: extent_type => extent
USE scales_ppm_base, ONLY: abort_ppm
USE ppm_base, ONLY: abort_ppm
USE mo_kind, ONLY: wp, dp
REAL(wp), INTENT(IN) :: b(:,:) ! right-hand-side b
......
......@@ -44,7 +44,7 @@ MODULE solver_config
USE solver_internal
USE mo_kind, ONLY: wp, dp
USE ppm_extents, ONLY: extent, extent_start, extent_end
USE scales_ppm_base, ONLY: abort_ppm
USE ppm_base, ONLY: abort_ppm
IMPLICIT NONE
......
......@@ -119,7 +119,7 @@ MODULE solver_internal
! Aborts if abnormal (NaN, Inf etc.) entries are present
SUBROUTINE abort_unless_normal0(x, x_str)
USE scales_ppm_base, ONLY: abort_ppm
USE ppm_base, ONLY: abort_ppm
USE ieee_arithmetic, ONLY: is_normal => ieee_is_normal
REAL(wp), INTENT(IN) :: x
......@@ -139,7 +139,7 @@ MODULE solver_internal
! Aborts if abnormal (NaN, Inf etc.) entries are present
SUBROUTINE abort_unless_normal1(x, x_str)
USE scales_ppm_base, ONLY: abort_ppm
USE ppm_base, ONLY: abort_ppm
USE ieee_arithmetic, ONLY: is_normal => ieee_is_normal
REAL(wp), INTENT(IN) :: x(:)
......@@ -164,7 +164,7 @@ MODULE solver_internal
! Aborts if abnormal (NaN, Inf etc.) entries are present
SUBROUTINE abort_unless_normal2(x, x_str)
USE scales_ppm_base, ONLY: abort_ppm
USE ppm_base, ONLY: abort_ppm
USE ieee_arithmetic, ONLY: is_normal => ieee_is_normal
REAL(wp), INTENT(IN) :: x(:,:)
......@@ -192,7 +192,7 @@ MODULE solver_internal
! Aborts if abnormal (NaN, Inf etc.) entries are present
SUBROUTINE abort_unless_normal3(x, x_str)
USE scales_ppm_base, ONLY: abort_ppm
USE ppm_base, ONLY: abort_ppm
USE ieee_arithmetic, ONLY: is_normal => ieee_is_normal
REAL(wp), INTENT(IN) :: x(:,:,:)
......
......@@ -46,7 +46,7 @@ MODULE solvers
USE linear_algebra
USE mo_kind, ONLY: wp, dp
USE ppm_extents, ONLY: extent_start, extent_end, extent_size, extent_type => extent
USE scales_ppm_base, ONLY: abort_ppm
USE ppm_base, ONLY: abort_ppm
IMPLICIT NONE
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment