Skip to content

Commit

Permalink
Merge pull request #53 from vickysharma0812/ninja-build
Browse files Browse the repository at this point in the history
changed .f90 to .F90 and removed -cpp flag
  • Loading branch information
vickysharma0812 committed Sep 27, 2021
2 parents 6efab35 + b68775f commit bddc99a
Show file tree
Hide file tree
Showing 542 changed files with 842 additions and 96,514 deletions.
4 changes: 2 additions & 2 deletions .fortls
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"src",
"tests"
],
"excl_suffixes": ["_skip.f90"],
"pp_suffixes": [".f90", ".inc", ".part"],
"excl_suffixes": ["_skip.F90"],
"pp_suffixes": [".F90", ".inc", ".part"],
"pp_defs": {},
"include_dirs": [
"/Users/vikassharma/.easifem/vscode/include/"
Expand Down
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ This fortran library handles IO with vtk files. [Read more](https://github.com/s
This fortran project, which is developed by [Michael Hirsch](https://github.com/scivision), can handle IO with hdf5 files. [Read more](https://github.com/geospace-code/h5fortran.git).

(7) OGPF
This is program creates an interface between modern fortran and gnuplot. This is a useful library for visualising fortran data using gnuplot. [Read more](https://github.com/kookma/ogpf). In easifem this is renamed as `Gnuplot_Method.f90`.
This is program creates an interface between modern fortran and gnuplot. This is a useful library for visualising fortran data using gnuplot. [Read more](https://github.com/kookma/ogpf). In easifem this is renamed as `Gnuplot_Method.F90`.

(8) Sparsekit

Expand All @@ -63,5 +63,5 @@ This is libray can handle exceptions in fortran. Source: https://github.com/CASL

(12) Fortran-TestAnything

It is a library for testing fortran program. Source : https://github.com/dennisdjensen/fortran-testanything. The original name of the program is changed from Test.f90 to Test_Method.f90 to confirm the coding standards of easifem.
It is a library for testing fortran program. Source : https://github.com/dennisdjensen/fortran-testanything. The original name of the program is changed from Test.F90 to Test_Method.F90 to confirm the coding standards of easifem.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ The vision of EASIFEM is to ease the coding part of FEM. This library can be emp

1. EASIFEM-base contains the fundamental user defined data-types and their methods, which are necessary for implementation of numerical methods such as finite element/volume/difference method, material point method, particle finite element method, random finite element method, among others.
2. EASIFEM-base is the lowest layer on which the entire landscape of EASIFEM resides.
3. All user defined data-types are included in a module called `baseType.f90`
4. Methods of a data-type, let us say XXX, are defined in a module, `XXX_method.f90` . It is noteworthy that this module only contains the interface of the method. Actual implementations are given in the submodules, `XXX_method@SubmoduleName.f90`. Modules are kept in a directory called `/modules` and submodules are kept in `/submodules`
3. All user defined data-types are included in a module called `baseType.F90`
4. Methods of a data-type, let us say XXX, are defined in a module, `XXX_method.F90` . It is noteworthy that this module only contains the interface of the method. Actual implementations are given in the submodules, `XXX_method@SubmoduleName.F90`. Modules are kept in a directory called `/modules` and submodules are kept in `/submodules`

Details of data-types and methods included in EASIFEM-base can be found [here](https://www.notion.so/d1490ecc9fa84e75ac9731c1f8538e67).

Expand Down
4 changes: 2 additions & 2 deletions cmake/Compiler.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ IF(NOT CMAKE_BUILD_TYPE)
ENDIF()

IF (${CMAKE_Fortran_COMPILER_ID} STREQUAL "GNU" OR Fortran_COMPILER_NAME MATCHES "gfortran*")
LIST(APPEND FORTRAN_FLAGS "-ffree-form" "-ffree-line-length-none" "-cpp" "-std=f2008" "-fimplicit-none" )
LIST(APPEND FORTRAN_FLAGS "-ffree-form" "-ffree-line-length-none" "-std=f2008" "-fimplicit-none" )
LIST(APPEND FORTRAN_FLAGS_RELEASE "-O3" )
LIST(APPEND FORTRAN_FLAGS_DEBUG "-fbounds-check" "-g" "-fbacktrace" "-Wextra" "-Wall" "-fprofile-arcs" "-ftest-coverage" "-Wimplicit-interface" )

ELSEIF(${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel" OR Fortran_COMPILER_NAME MATCHES "ifort*")
LIST(APPEND FORTRAN_FLAGS "-r8" "-fpp" "-W1")
LIST(APPEND FORTRAN_FLAGS "-r8" "-W1")
LIST(APPEND FORTRAN_FLAGS_RELEASE "-O3")
LIST(APPEND FORTRAN_FLAGS_DEBUG "-O0" "-traceback" "-g" "-debug all" "-check all" "-ftrapuv" "-warn" "nointerfaces")

Expand Down
2 changes: 1 addition & 1 deletion src/modules/BLAS/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
set(src_path "${CMAKE_CURRENT_LIST_DIR}/src/")
target_sources(
${PROJECT_NAME} PRIVATE
${src_path}/BLAS1V_Method.f90
${src_path}/BLAS1V_Method.F90
)
Empty file.
Empty file.
Loading

0 comments on commit bddc99a

Please sign in to comment.