Skip to content

Commit

Permalink
remove unused pathlib
Browse files Browse the repository at this point in the history
  • Loading branch information
scivision committed Nov 21, 2021
1 parent c687db9 commit 621beef
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 96 deletions.
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ authors:
given-names: Michael
orcid: https://orcid.org/0000-0002-1637-6526
title: nc4fortran
version: 1.4.6
version: 1.4.7
doi: 10.5281/zenodo.3598941
date-released: 2021-11-08
6 changes: 3 additions & 3 deletions codemeta.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"@context": "https://doi.org/10.5063/schema/codemeta-2.0",
"@type": "SoftwareSourceCode",
"license": "https://spdx.org/licenses/BSD-3-Clause",
"license": "https://spdx.org/licenses/MIT",
"codeRepository": "https://github.com/geospace-code/nc4fortran",
"contIntegration": "https://github.com/geospace-code/nc4fortran/actions",
"dateModified": "2021-01-31",
"dateModified": "2021-11-21",
"downloadUrl": "https://github.com/geospace-code/nc4fortran/releases",
"issueTracker": "https://github.com/geospace-code/nc4fortran/issues",
"name": "nc4fortran",
"version": "1.4.6",
"version": "1.4.7",
"identifier": "10.5281/zenodo.3757221",
"description": "Lightweight object-oriented NetCDF4 Fortran interface",
"applicationCategory": "file I/O",
Expand Down
8 changes: 0 additions & 8 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@

set(is_windows .false.)
if(WIN32)
set(is_windows .true.)
endif()
configure_file(pathlib.in.f90 pathlib.f90 @ONLY)

file(READ reader_template.in.f90 reader_template)
configure_file(reader.in.f90 reader.f90 @ONLY)

Expand All @@ -22,5 +15,4 @@ interface.f90
read.f90 ${CMAKE_CURRENT_BINARY_DIR}/reader.f90
write.f90 ${CMAKE_CURRENT_BINARY_DIR}/writer.f90
attributes.f90
${CMAKE_CURRENT_BINARY_DIR}/pathlib.f90
)
15 changes: 0 additions & 15 deletions src/interface.f90
Original file line number Diff line number Diff line change
Expand Up @@ -70,21 +70,6 @@ module nc4fortran

!> Submodules

interface !< pathlib.f90
module logical function std_unlink(filename)
character(*), intent(in) :: filename
end function std_unlink

module logical function is_absolute_path(path)
character(*), intent(in) :: path
end function is_absolute_path

module function get_tempdir()
character(:), allocatable :: get_tempdir
end function

end interface

interface !< writer.f90
module subroutine nc_write_scalar_char(self, dname, value, ierr)
class(netcdf_file), intent(in) :: self
Expand Down
36 changes: 15 additions & 21 deletions src/meson.build
Original file line number Diff line number Diff line change
@@ -1,27 +1,21 @@
is_windows = os == 'windows' ? '.true.' : '.false.'

configure_file(
input : 'pathlib.in.f90',
output : 'pathlib.f90',
configuration : {'is_windows': is_windows})

configure_file(
input : 'reader.in.f90',
output : 'reader.f90',
configuration : {'reader_template': fs.read('reader_template.in.f90')}
input : 'reader.in.f90',
output : 'reader.f90',
configuration : {'reader_template': fs.read('reader_template.in.f90')}
)

configure_file(
input : 'writer.in.f90',
output : 'writer.f90',
configuration : {
'writer_template_r32': fs.read('writer_template_r32.in.f90'),
'writer_template_r64': fs.read('writer_template_r64.in.f90'),
'writer_template_i32': fs.read('writer_template_i32.in.f90'),
'writer_template_i64': fs.read('writer_template_i64.in.f90')
})
input : 'writer.in.f90',
output : 'writer.f90',
configuration : {
'writer_template_r32': fs.read('writer_template_r32.in.f90'),
'writer_template_r64': fs.read('writer_template_r64.in.f90'),
'writer_template_i32': fs.read('writer_template_i32.in.f90'),
'writer_template_i64': fs.read('writer_template_i64.in.f90')
}
)

nc4_src = files('interface.f90', 'attributes.f90',
'read.f90', meson.current_build_dir() / 'reader.f90',
'write.f90', meson.current_build_dir() / 'writer.f90',
meson.current_build_dir() / 'pathlib.f90')
'read.f90', meson.current_build_dir() / 'reader.f90',
'write.f90', meson.current_build_dir() / 'writer.f90'
)
48 changes: 0 additions & 48 deletions src/pathlib.in.f90

This file was deleted.

0 comments on commit 621beef

Please sign in to comment.