Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates in triangle, opengl, raylib, and triangle lib #304

Merged
merged 47 commits into from
May 10, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
90927dd
working on new master trig master elem
vickysharma0812 Apr 20, 2024
416b061
updating .gitignore
vickysharma0812 Apr 21, 2024
f413bd9
trying-debugging
shishiousan Apr 22, 2024
667874a
updating mapping utility
vickysharma0812 Apr 22, 2024
b10f986
updating triangle interpolation
vickysharma0812 Apr 22, 2024
d59bec7
updates in ultraspherical methods
vickysharma0812 Apr 22, 2024
131edcd
updating lobatto poly
vickysharma0812 Apr 22, 2024
50445b4
cleaning the tria interpolation
vickysharma0812 Apr 22, 2024
4b20e71
updating gradient method in triag interpol
vickysharma0812 Apr 22, 2024
1fe511d
fixing bug in gradient of heirarc in triag interpol
vickysharma0812 Apr 22, 2024
dc05cb1
fixing a bug in bary edge base grad in tria interpol
vickysharma0812 Apr 22, 2024
99c1515
minor updates in triag interpol
vickysharma0812 Apr 22, 2024
0912174
Merge branch 'gradient' into new-master-triangle
vickysharma0812 Apr 23, 2024
9442f83
updating triangle interpolation utility
vickysharma0812 Apr 23, 2024
c946e1d
updates in triangle inteprol
vickysharma0812 Apr 23, 2024
8f42028
working on triangle inteprolation
vickysharma0812 Apr 27, 2024
84ff629
updating preset file
vickysharma0812 Apr 27, 2024
47f632d
updating lobatto and ultraspherical polynomial
vickysharma0812 Apr 27, 2024
a3e030c
updating triangle interpolation utility
vickysharma0812 Apr 27, 2024
71d930e
updates in triangle interpolation
vickysharma0812 Apr 27, 2024
1b85088
updating orthogonal basis in triangle
vickysharma0812 Apr 27, 2024
4629ac1
updates in mapping util
vickysharma0812 Apr 30, 2024
9b3f2df
updates in triangle interpolation util
vickysharma0812 Apr 30, 2024
ba8fa09
updates in triangle interpolation
vickysharma0812 May 2, 2024
a2d2cf7
adding raylib interface
vickysharma0812 May 3, 2024
7c5a6de
adding get methods in raylib
vickysharma0812 May 3, 2024
5db19c4
adding set methods in Raylub
vickysharma0812 May 3, 2024
e0cedd9
adding image methods in raylib
vickysharma0812 May 3, 2024
b58a66b
adding load unload methods in raylib
vickysharma0812 May 3, 2024
76dfe9f
adding check and is methods
vickysharma0812 May 3, 2024
6202c41
minor formating in raylib
vickysharma0812 May 3, 2024
ee09ce9
working on raylib
vickysharma0812 May 3, 2024
f31556d
working on raylib
vickysharma0812 May 3, 2024
461fd8c
renaming methods of Raylib
vickysharma0812 May 3, 2024
0d3b5d0
working on raylib
vickysharma0812 May 3, 2024
488334e
updates in triangle interpolation
vickysharma0812 May 3, 2024
8ccd1bc
Merge branch 'dev-raylib' into new-master-triangle
vickysharma0812 May 3, 2024
7c93fd6
removing reduntant files from polynomial
vickysharma0812 May 3, 2024
b15a992
updating gitignore and raylib
vickysharma0812 May 8, 2024
54c6913
minor formatting in sytem
vickysharma0812 May 8, 2024
dfa1fc8
minor updates in triangle interpolation utility
vickysharma0812 May 8, 2024
3e9dbd5
updates in utility
vickysharma0812 May 8, 2024
6a631c5
updates in quadraturepoint triangle solin
vickysharma0812 May 8, 2024
621d630
updates in triangle interpolation utility
vickysharma0812 May 8, 2024
eb4ba02
updates in mapping utility
vickysharma0812 May 8, 2024
58a3c6a
minor updates in cmake
vickysharma0812 May 8, 2024
298dc8e
adding triangle interface
vickysharma0812 May 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
adding triangle interface
  • Loading branch information
vickysharma0812 committed May 9, 2024
commit 298dc8ec2b537c00cf1b33a9fb2f4cb2ebcca684
3 changes: 3 additions & 0 deletions src/modules/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ include(${CMAKE_CURRENT_LIST_DIR}/FPL/CMakeLists.txt)
# System
include(${CMAKE_CURRENT_LIST_DIR}/System/CMakeLists.txt)

# TriangleInterface
include(${CMAKE_CURRENT_LIST_DIR}/TriangleInterface/CMakeLists.txt)

# BLAS95
include(${CMAKE_CURRENT_LIST_DIR}/BLAS95/CMakeLists.txt)

Expand Down
67 changes: 33 additions & 34 deletions src/modules/RaylibInterface/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,39 +1,38 @@
# This program is a part of EASIFEM library
# Copyright (C) 2020-2021 Vikas Sharma, Ph.D
# This program is a part of EASIFEM library Copyright (C) 2020-2021 Vikas
# Sharma, Ph.D
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# This program is free software: you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation, either version 3 of the License, or (at your option) any later
# version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# This program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
# details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https: //www.gnu.org/licenses/>
# You should have received a copy of the GNU General Public License along with
# this program. If not, see <https: //www.gnu.org/licenses/>
#

IF(USE_RAYLIB)
SET(src_path "${CMAKE_CURRENT_LIST_DIR}/src/")
TARGET_SOURCES(
${PROJECT_NAME} PRIVATE
${src_path}/RaylibTypes.F90
${src_path}/RaylibEnums.F90
${src_path}/RaylibDrawMethods.F90
${src_path}/RaylibGetMethods.F90
${src_path}/RaylibSetMethods.F90
${src_path}/RaylibImageMethods.F90
${src_path}/RaylibUnloadMethods.F90
${src_path}/RaylibLoadMethods.F90
${src_path}/RaylibIsMethods.F90
${src_path}/RaylibCheckMethods.F90
${src_path}/RaylibGenMethods.F90
${src_path}/RaylibMethods.F90
${src_path}/Raylib.F90
${src_path}/RaylibCamera.F90
${src_path}/RaylibMath.F90
${src_path}/RaylibUtil.F90
)
ENDIF()
if(USE_RAYLIB)
set(src_path "${CMAKE_CURRENT_LIST_DIR}/src/")
target_sources(
${PROJECT_NAME}
PRIVATE ${src_path}/RaylibTypes.F90
${src_path}/RaylibEnums.F90
${src_path}/RaylibDrawMethods.F90
${src_path}/RaylibGetMethods.F90
${src_path}/RaylibSetMethods.F90
${src_path}/RaylibImageMethods.F90
${src_path}/RaylibUnloadMethods.F90
${src_path}/RaylibLoadMethods.F90
${src_path}/RaylibIsMethods.F90
${src_path}/RaylibCheckMethods.F90
${src_path}/RaylibGenMethods.F90
${src_path}/RaylibMethods.F90
${src_path}/Raylib.F90
${src_path}/RaylibCamera.F90
${src_path}/RaylibMath.F90
${src_path}/RaylibUtil.F90)
endif()
16 changes: 11 additions & 5 deletions src/modules/System/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,26 @@
set(src_path "${CMAKE_CURRENT_LIST_DIR}/src/")
target_sources(${PROJECT_NAME} PRIVATE ${src_path}/System_Method.F90)

add_library(easifemSystemMethodC STATIC ${src_path}/System_Method.c)
target_link_libraries(${PROJECT_NAME} PUBLIC easifemSystemMethodC)

set(subproject_name "easifemSystem")

add_library(${subproject_name} STATIC ${src_path}/System_Method.c)

target_link_libraries(${PROJECT_NAME} PUBLIC ${subproject_name})

# target properties

set_target_properties(
easifemSystemMethodC
${subproject_name}
PROPERTIES POSITION_INDEPENDENT_CODE 1
SOVERSION ${VERSION_MAJOR}
OUTPUT_NAME ${PROJECT_NAME}
# OUTPUT_NAME ${PROJECT_NAME}
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
MACOSX_RPATH ON
WINDOWS_EXPORT_ALL_SYMBOLS ON
LINKER_LANGUAGE C)

list(APPEND C_PROJECTS "easifemSystemMethodC")

list(APPEND C_PROJECTS ${subproject_name})
63 changes: 63 additions & 0 deletions src/modules/TriangleInterface/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# This program is a part of EASIFEM library Expandable And Scalable
# Infrastructure for Finite Element Methods htttps://www.easifem.com Vikas
# Sharma, Ph.D., vickysharma0812@gmail.com
#
# This program is free software: you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation, either version 3 of the License, or (at your option) any later
# version.
#
# This program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
# details.
#
# You should have received a copy of the GNU General Public License along with
# this program. If not, see <https: //www.gnu.org/licenses/>
#

set(src_path "${CMAKE_CURRENT_LIST_DIR}/src/")
target_sources(${PROJECT_NAME} PRIVATE ${src_path}/TriangleInterface.F90)

add_library(easifemTriangle STATIC
${src_path}/triangle.c
${src_path}/report.c
)

target_link_libraries(${PROJECT_NAME} PUBLIC easifemTriangle)

list(APPEND TRIANGLE_COMPILE_DEF "-DTRILIBRARY" "-DANSI_DECLARATORS"
"-DNO_TIMER")

if(USE_Real64)
list(APPEND TRIANGLE_COMPILE_DEF "-DUSE_Real64")
endif()

if(LINUX)
list(APPEND TRIANGLE_COMPILE_DEF "-DLINUX")

elseif(WIN32)
list(APPEND TRIANGLE_COMPILE_DEF "-DCPU86")

endif()

target_compile_definitions(easifemTriangle PRIVATE ${TRIANGLE_COMPILE_DEF})

list(APPEND TRIANGLE_COMPILE_OPTIONS "-O3")

target_compile_options(easifemTriangle PRIVATE ${TRIANGLE_COMPILE_OPTIONS})

# target properties
set_target_properties(
easifemTriangle
PROPERTIES POSITION_INDEPENDENT_CODE 1
SOVERSION ${VERSION_MAJOR}
# OUTPUT_NAME ${PROJECT_NAME}
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
MACOSX_RPATH ON
WINDOWS_EXPORT_ALL_SYMBOLS ON
LINKER_LANGUAGE C )

list(APPEND C_PROJECTS "easifemTriangle")
Loading
Loading