updates comments/variable names

danielpeter · Mar 15, 2024 · ae21f0e · ae21f0e
1 parent aa8e9dc
commit ae21f0e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 21 deletions.
diff --git a/configure.ac b/configure.ac
@@ -76,9 +76,6 @@ AM_CONDITIONAL([COND_MPI], [test x"$want_mpi" = xyes])
 ### FORCE_VECTORIZATION
 ###
 
-## note: vectorization support has been removed by DK due to problems with Intel compilers (2016).
-##       enabling will have no effect.
-
 AC_ARG_ENABLE([vectorization],
     [AS_HELP_STRING([--enable-vectorization],
         [build FORCE_VECTORIZATION enabled version @<:@default=auto@:>@])],

diff --git a/src/gpu/prepare_constants_cuda.h b/src/gpu/prepare_constants_cuda.h
@@ -131,7 +131,7 @@ void setConst_hprime_xx(realw* array,Mesh* mp)
   if (err != cudaSuccess)
   {
     fprintf(stderr, "Error in setConst_hprime_xx: %s\n", cudaGetErrorString(err));
-    fprintf(stderr, "The problem is maybe -arch sm_13 instead of -arch sm_11 in the Makefile, please doublecheck\n");
+    fprintf(stderr, "The problem is maybe that the architecture specified in the Makefile (-gencode=arch=compute_**,code=\"sm_**,compute_**\") doesn't fit your card, please doublecheck\n");
     exit(1);
   }
 
@@ -170,7 +170,6 @@ void setConst_hprime_xx(realw* array,Mesh* mp)
 //   if (err != cudaSuccess)
 //   {
 //     fprintf(stderr, "Error in setConst_hprime_yy: %s\n", cudaGetErrorString(err));
-//     fprintf(stderr, "The problem is maybe -arch sm_13 instead of -arch sm_11 in the Makefile, please doublecheck\n");
 //     exit(1);
 //   }
 
@@ -188,7 +187,6 @@ void setConst_hprime_xx(realw* array,Mesh* mp)
 //   if (err != cudaSuccess)
 //   {
 //     fprintf(stderr, "Error in setConst_hprime_zz: %s\n", cudaGetErrorString(err));
-//     fprintf(stderr, "The problem is maybe -arch sm_13 instead of -arch sm_11 in the Makefile, please doublecheck\n");
 //     exit(1);
 //   }
 

diff --git a/src/shared/init_openmp.F90 b/src/shared/init_openmp.F90
@@ -75,7 +75,7 @@ subroutine init_openmp()
       write(IMAIN,*) '  number of threads (per MPI process) = ', num_threads
       write(IMAIN,*)
       write(IMAIN,*) '  number of processors available      = ', num_procs
-      write(IMAIN,*) '  maximum number of threads available = ', num_procs
+      write(IMAIN,*) '  maximum number of threads available = ', max_threads
       write(IMAIN,*) '  dynamic thread adjustement          = ', is_dynamic
       !write(IMAIN,*) '  nested parallelism                  = ', is_nested
       write(IMAIN,*) '  maximum nested active levels        = ', max_active_levels

diff --git a/src/specfem3D/prepare_optimized_arrays.F90 b/src/specfem3D/prepare_optimized_arrays.F90
@@ -79,8 +79,8 @@ subroutine prepare_timerun_OpenMP()
 
   ! local parameters
   integer :: ier
-  integer :: NUM_THREADS
-  integer :: OMP_GET_MAX_THREADS
+  integer :: max_threads
+  integer,external :: OMP_GET_MAX_THREADS
 
 
 ! the old OpenMP implementation for compute_forces_viscoelastic is in utils/infos/unused_routines/:
@@ -92,12 +92,12 @@ subroutine prepare_timerun_OpenMP()
   ! for example, run executable with:
   ! OMP_NUM_THREADS=4 mpirun -np 2 ./bin/xspecfem3D
   !
-  NUM_THREADS = OMP_GET_MAX_THREADS()
+  max_threads = OMP_GET_MAX_THREADS()
 
   ! output info
   if (myrank == 0) then
     write(IMAIN,*) '  OpenMP:'
-    write(IMAIN,*) '    using',NUM_THREADS,' OpenMP threads'
+    write(IMAIN,*) '    using',max_threads,' OpenMP threads'
     call flush_IMAIN()
   endif
 

diff --git a/utils/Visualization/Blender/python_blender/convert_openstreetmap_buildings_to_mesh.py b/utils/Visualization/Blender/python_blender/convert_openstreetmap_buildings_to_mesh.py
@@ -3,16 +3,16 @@
 # downloads openstreetmap buildings and creates 3d mesh objects saved in .ply format
 #
 # required python modules:
-# - numpy
-# - scipy
-# - pygmt
-# - pyproj
-# - xarray
-# - osmnx
-# - geopandas
-# - trimesh
-# - rtree
-# - mapbox_earcut
+# - numpy          (numpy==1.26.3)
+# - scipy          (scipy-1.11.4)
+# - pygmt          (pygmt==0.10.0)
+# - pyproj         (pyproj==3.6.1)
+# - xarray         (xarray==2023.10.1)
+# - osmnx          (osmnx==1.8.1)
+# - geopandas      (geopandas==0.14.2)
+# - trimesh        (trimesh==4.0.10)
+# - rtree          (Rtree==1.2.0)
+# - mapbox_earcut  (mapbox-earcut==1.0.1)
 #
 #################################################################