Skip to content

Commit

Permalink
Consistent naming with smesh_ prefix (#6)
Browse files Browse the repository at this point in the history
Consistent naming with `smesh_` prefix
  • Loading branch information
sloede committed Jan 25, 2024
1 parent 36aa7a1 commit 6ad5da5
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
make install
- name: Run test
run: |
install/bin/test_smesh
install/bin/smesh_test
# Enable tmate debugging of manually-triggered workflows if the input option was provided
- name: Setup tmate session for debugging
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled && always() }}
Expand Down
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ add_library(smesh SHARED
${CMAKE_SOURCE_DIR}/src/smesh.f90
)

add_library(input_output SHARED
${CMAKE_SOURCE_DIR}/src/input_output.f90
add_library(smesh_io SHARED
${CMAKE_SOURCE_DIR}/src/smesh_io.f90
)

add_executable(test_smesh
${CMAKE_SOURCE_DIR}/src/test_smesh.f90
add_executable(smesh_test
${CMAKE_SOURCE_DIR}/src/smesh_test.f90
)
target_link_libraries(test_smesh PRIVATE smesh input_output)
target_link_libraries(smesh_test PRIVATE smesh smesh_io)

install(TARGETS smesh input_output test_smesh)
install(TARGETS smesh smesh_io smesh_test)
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/smesh.f90
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

MODULE smesh

! USE input_output, only: prt_bin, prt
! USE smesh_io, only: prt_bin, prt

IMPLICIT NONE

Expand Down
6 changes: 3 additions & 3 deletions src/input_output.f90 → src/smesh_io.f90
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MODULE input_output
MODULE smesh_io

IMPLICIT NONE

Expand Down Expand Up @@ -515,7 +515,7 @@ SUBROUTINE load_binary_matrix3_integer(filename, M)
END SUBROUTINE load_binary_matrix3_integer


END MODULE input_output
END MODULE smesh_io

! for reading binary files in python
! def load_fortran_binary(filename):
Expand Down Expand Up @@ -545,4 +545,4 @@ END MODULE input_output
! return np.fromfile(f, dtype=dtype, count=nelem, sep="").reshape(shape[::-1]).transpose()
! else:
! return np.fromfile(f, dtype=dtype, count=nelem, sep="").flatten()


8 changes: 4 additions & 4 deletions src/test_smesh.f90 → src/smesh_test.f90
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PROGRAM test_smesh
PROGRAM smesh_test

USE input_output
USE smesh_io
USE smesh

IMPLICIT NONE
Expand All @@ -22,7 +22,7 @@ PROGRAM test_smesh

! --- Read settings from a text file ---

OPEN(unit=21, file="test_smesh.cfg", status="old", access="sequential", action="read")
OPEN(unit=21, file="smesh_test.cfg", status="old", access="sequential", action="read")
READ(21,*) ! input data
READ(21,*) problem_type
READ(21,*) filename_points
Expand Down Expand Up @@ -226,7 +226,7 @@ END SUBROUTINE mesh_bisected_rectangle
! k += 1
! return points

END PROGRAM test_smesh
END PROGRAM smesh_test



0 comments on commit 6ad5da5

Please sign in to comment.