Refactored dependent codes into a single code. Modified makefile temp…

…late accordingly. Updated build scripts.
predsci · Apr 17, 2024 · 50dc6c0 · 50dc6c0
1 parent cb39485
commit 50dc6c0
Show file tree

Hide file tree

Showing 17 changed files with 1,424 additions and 4,862 deletions.
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2024 Predictive Science Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/build_examples/build_cpu_mpi+multithread_gcc10+11_ubuntu20.04.sh b/build_examples/build_cpu_mpi+multithread_gcc10+11_ubuntu20.04.sh
diff --git a/...d_cpu_mpi+multithread_gcc9_ubuntu20.04.sh → ...ld_cpu_mpi+multithread_gcc_ubuntu20.04.sh b/...d_cpu_mpi+multithread_gcc9_ubuntu20.04.sh → ...ld_cpu_mpi+multithread_gcc_ubuntu20.04.sh
diff --git a/...cpu_mpi+multithread_nv22.3_ubuntu20.04.sh → ...cpu_mpi+multithread_nvidia_ubuntu20.04.sh b/...cpu_mpi+multithread_nv22.3_ubuntu20.04.sh → ...cpu_mpi+multithread_nvidia_ubuntu20.04.sh
diff --git a/build_examples/build_cpu_mpi-only_gcc10+11_ubuntu20.04.sh b/build_examples/build_cpu_mpi-only_gcc10+11_ubuntu20.04.sh
diff --git a/...es/build_cpu_mpi-only_gcc9_ubuntu20.04.sh → ...les/build_cpu_mpi-only_gcc_ubuntu20.04.sh b/...es/build_cpu_mpi-only_gcc9_ubuntu20.04.sh → ...les/build_cpu_mpi-only_gcc_ubuntu20.04.sh
diff --git a/.../build_cpu_mpi-only_nv22.3_ubuntu20.04.sh → .../build_cpu_mpi-only_nvidia_ubuntu20.04.sh b/.../build_cpu_mpi-only_nv22.3_ubuntu20.04.sh → .../build_cpu_mpi-only_nvidia_ubuntu20.04.sh
diff --git a/..._examples/build_gpu_nv22.3_ubuntu20.04.sh → ..._examples/build_gpu_nvidia_ubuntu20.04.sh b/..._examples/build_gpu_nv22.3_ubuntu20.04.sh → ..._examples/build_gpu_nvidia_ubuntu20.04.sh
@@ -23,7 +23,7 @@ HDF5_LIB_FLAGS="-lhdf5_fortran -lhdf5hl_fortran -lhdf5 -lhdf5_hl"
 # Please set the compile flags based on your compiler and hardware setup.
 ###########################################################################
 
-FFLAGS="-O3 -march=native -stdpar=gpu -acc=gpu -gpu=nomanaged -Minfo=accel"
+FFLAGS="-O3 -march=native -stdpar=gpu -acc=gpu -gpu=nomanaged,nounified -Minfo=accel"
 
 ###########################################################################
 # If using NV HPC SDK for GPUs, with CUDA version >= 11.3, you can set 

diff --git a/src/Makefile.template b/src/Makefile.template
@@ -14,11 +14,7 @@ endif
 
 FFLAGS = <FFLAGS> $(PARADD) -I<HDF5_INCLUDE_DIR>
 
-OBJS0 = number_types.o \
- zm_parse_modules.o \
- zm_parse.o \
- zm_sds_modules.o \
- zm_sds.o
+OBJS0 = psi_io.o
 
 ifeq ($(POT3D_CUSPARSE),1)
   OBJS = $(OBJS0) lusol_cusparse.o pot3d_cpp.o
@@ -39,19 +35,7 @@ clean:
 pot3d_cpp.f: pot3d.F
 	$(FC) -E -cpp $(IF_DEF) > pot3d_cpp.f $<
 
-number_types.o: number_types.f
-	$(FC) -c $(FFLAGS) $<
-
-zm_parse_modules.o: zm_parse_modules.f
-	$(FC) -c $(FFLAGS) $<
-
-zm_parse.o: zm_parse.f zm_parse_modules.f number_types.f
-	$(FC) -c $(FFLAGS) $<
-
-zm_sds_modules.o: zm_sds_modules.f
-	$(FC) -c $(FFLAGS) $<
-
-zm_sds.o: zm_sds.f zm_sds_modules.f number_types.f
+psi_io.o: psi_io.f90
 	$(FC) -c $(FFLAGS) $<
 
 lusol_cusparse.o: lusol_cusparse.c 

diff --git a/src/number_types.f b/src/number_types.f
diff --git a/src/pot3d.F b/src/pot3d.F
@@ -56,6 +56,27 @@ module ident
       character(*), parameter :: update='10/24/2022'
 c
       end module
+c#######################################################################
+      module number_types
+c
+c-----------------------------------------------------------------------
+c ****** Basic number types.
+c ****** This module is used to set the default precision for REALs.
+c-----------------------------------------------------------------------
+c
+      use iso_fortran_env
+c
+c-----------------------------------------------------------------------
+c
+      implicit none
+c
+      integer, parameter :: KIND_REAL_4=REAL32
+      integer, parameter :: KIND_REAL_8=REAL64
+      integer, parameter :: KIND_REAL_16=max(REAL128,REAL64)
+c
+      integer, parameter :: r_typ=KIND_REAL_8
+c
+      end module
 c#######################################################################
       module number_types_pc
 c
@@ -6414,8 +6435,8 @@ subroutine readbr (fname,br0_g,ierr)
       use number_types
       use global_dims
       use global_mesh
-      use rdhdf_2d_interface
       use vars
+      use rdhdf_2d_interface
 c
 c-----------------------------------------------------------------------
 c