Restructured python files and fixed bugs to make the code more compat…

…ible with ifx
MintonGroup · Feb 10, 2024 · b880239 · b880239
1 parent f6582cb
commit b880239
Show file tree

Hide file tree

Showing 17 changed files with 31 additions and 1,305 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@
 !distclean.cmake
 !README.md
 !version.txt
+!ctem/
 !ctem/**.py
 !cmake/Modules/*.cmake
 !*.bash

diff --git a/cmake/Modules/SetFortranFlags.cmake b/cmake/Modules/SetFortranFlags.cmake
@@ -533,10 +533,10 @@ IF (CMAKE_BUILD_TYPE STREQUAL "RELEASE" OR CMAKE_BUILD_TYPE STREQUAL "PROFILE")
             )
 
             # Tells the compiler to link to certain libraries in the Intel oneAPI Math Kernel Library (oneMKL). 
-            SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE}"
-                Fortran "/Qmkl:cluster" # Intel Windows
-                        "/Qmkl"     # Intel Windows
-            ) 
+            # SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE}"
+            #     Fortran "/Qmkl:cluster" # Intel Windows
+            #             "/Qmkl"     # Intel Windows
+            # ) 
 
             # Enables additional interprocedural optimizations for a single file compilation
             SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE}"
@@ -574,10 +574,10 @@ IF (CMAKE_BUILD_TYPE STREQUAL "RELEASE" OR CMAKE_BUILD_TYPE STREQUAL "PROFILE")
             )
 
             # Tells the compiler to link to certain libraries in the Intel oneAPI Math Kernel Library (oneMKL). 
-            SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE}"
-                Fortran "-qmkl=cluster" # Intel
-                        "-qmkl"     # Intel
-            ) 
+            # SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE}"
+            #     Fortran "-qmkl=cluster" # Intel
+            #             "-qmkl"     # Intel
+            # ) 
 
             # Enables additional interprocedural optimizations for a single file compilation
             SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE}"

diff --git a/ctem/ctem/NPF.py b/ctem/ctem/NPF.py
diff --git a/ctem/ctem/__init__.py b/ctem/ctem/__init__.py
diff --git a/ctem/ctem/craterproduction.py b/ctem/ctem/craterproduction.py