Merge pull request #389 from ywkawai/feature/jobshell_FUGAKU

Feature/jobshell fugaku
ywkawai · Jan 16, 2025 · 6bcf362 · 6bcf362
2 parents 0278f61 + a0bc704
commit 6bcf362
Show file tree

Hide file tree

Showing 28 changed files with 256 additions and 863 deletions.
diff --git a/.github/workflows/FEProject_build.yml b/.github/workflows/FEProject_build.yml
@@ -64,47 +64,46 @@ jobs:
         make -j 2 -C FElib/src
 
     - name: unit test for common
+      env: 
+        testdirs: linkedlist time_manager sparsemat timeint_rk
       run: | 
         echo "Perform unit tests .."
 
         export SCALE_FE_SYS=Linux64-gnu-ompi
         export SCALE=${GITHUB_WORKSPACE}/../scale
 
         cd FElib/test/common
-        make -C linkedlist
-        make -C time_manager
-        make -C sparsemat
-        make -C timeint_rk
+        for testdir in ${testdirs}; do
+          make -C ${testdir} && make -C ${testdir} run
+        done
 
     - name: unit test for FE
+      env: 
+        testdirs: polynominal mesh_linedom1d mesh_rectdom2d_quadrilateral mesh_cubedsphere2d mesh_cubedom3d_hexahedral mesh_cubedsphere3d field_linedom1d field_rectdom2d_quadrilateral field_cubedspheredom2d field_cubedom3d_hexahedral field_cubedspheredom3d
       run: | 
         echo "Perform unit tests .."
 
         export SCALE_FE_SYS=Linux64-gnu-ompi
         export SCALE=${GITHUB_WORKSPACE}/../scale
 
         cd FElib/test/FE
-        make -C polynominal
-        make -C mesh_linedom1d
-        make -C mesh_rectdom2d_quadrilateral
-        make -C mesh_cubedsphere2d
-        make -C mesh_cubedom3d_hexahedral
-        make -C mesh_cubedsphere3d
-        make -C field_linedom1d
-        make -C field_rectdom2d_quadrilateral
-        make -C field_cubedspheredom2d
-        make -C field_cubedom3d_hexahedral
-        make -C field_cubedspheredom3d
+        for testdir in ${testdirs}; do
+          make -C ${testdir} && make -C ${testdir} run
+        done
     
-    - name: unit test for framework
+    - name: unit test for model framework
+      env: 
+        testdirs: model_framework
       run: | 
         echo "Perform unit tests .."
 
         export SCALE_FE_SYS=Linux64-gnu-ompi
         export SCALE=${GITHUB_WORKSPACE}/../scale
 
         cd FElib/test/framework
-        make -C model_framework
+        for testdir in ${testdirs}; do
+          make -C ${testdir} && make -C ${testdir} run
+        done
 
     - name: samples
       run: | 

diff --git a/COPYRIGHT b/COPYRIGHT
@@ -1,4 +1,4 @@
-Copyright (C) 2019--2024 FE-project Group. All rights reserved.
+Copyright (C) 2019--2025 FE-project Group. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -21,7 +21,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 -------------- Japanese Version start here --------------------------
 
-Copyright (C) 2019--2024 FE-project Group. All rights reserved.
+Copyright (C) 2019--2025 FE-project Group. All rights reserved.
 
 以下に定める条件に従い、本ソフトウェアおよび関連文書のファイル（以下「ソ
 フトウェア」）の複製を取得するすべての人に対し、ソフトウェアを無制限に扱

diff --git a/FElib/test/FE/field_cubedom3d_hexahedral/Makefile b/FElib/test/FE/field_cubedom3d_hexahedral/Makefile
@@ -6,57 +6,14 @@
 
 PWD         = $(shell pwd)
 TOPDIR      = $(abspath ../../../..)
-BUILD_DIR   = ./.libs
-SYSDEP_DIR  = $(TOPDIR)/sysdep
-
-include $(SYSDEP_DIR)/Makedef.$(SCALE_FE_SYS)
-include $(TOPDIR)/Mkinclude
+FELIB_TEST_DIR = ../../
 
 BINNAME = test_field_cubedom3d_hexahedral
+OBJS    =
 
-LIBS = $(LIBDIR)/libScaleFECore.a
-
-OBJS =
-
-all:
-	$(MAKE) envlog
-	$(MAKE) makedir
-	$(MAKE) makebin
-	$(MAKE) run
-
-makedir:
-	mkdir -p $(BUILD_DIR)
-
-makebin: $(BINNAME)
-	@echo "Complete making."
-
-run:
-	mpirun -n 1 ./$(BINNAME) test.conf
-
-vis:
-	bash ./visualize/visualize.sh
-
-$(BINNAME): $(BUILD_DIR)/$(BINNAME).o $(patsubst %,$(BUILD_DIR)/%,$(OBJS)) $(LIBS)
-	$(LD) $(LDFLAGS) $(ADDITIONAL_FFLAGS) -o $@ $^ $(LIBS) $(CONTRIB_LIBS)  $(SCALE_NETCDF_LIBS) $(SCALE_MATHLIB_LIBS) $(SCALE_PAPI_LIBS)
-
-$(BUILD_DIR)/$(BINNAME).o: $(BINNAME).f90 $(patsubst %,$(BUILD_DIR)/%,$(OBJS))
-
-distclean: clean
-	rm -f $(BINNAME)
-
-clean:
-	rm -rf $(BUILD_DIR)
-	rm -f *.nc
-
-.SUFFIXES:
-.SUFFIXES: .o .f90 .mod
-
-%.mod: %.f90
-	$(MAKE) $(patsubst %.f90,%.o,$<)
-
-$(BUILD_DIR)/%.o: %.f90
-	$(FC) $(FFLAGS) $(ADDITIONAL_FFLAGS) -DVERSION_MACRO=\"$(VERSION)\" -I$(BUILD_DIR) -I$(MODDIR) $(CONTRIB_INCLUDE) -I$(SCALEFELIBDIR)/include  $(SCALE_NETCDF_INCLUDE) $(MODDIROPT) $(BUILD_DIR) -o $@ -c $<
-
-.PHONY : clean distclean allclean
+RUNCONF         = test.conf
+TPROC           = 1
+OMP_NUM_THREADS = 1
 
-include $(TOPDIR)/utils/make/Make_environments
+#------------------------------------------------------
+include $(FELIB_TEST_DIR)/Makefile.common
diff --git a/FElib/test/FE/field_cubedspheredom2d/Makefile b/FElib/test/FE/field_cubedspheredom2d/Makefile
@@ -6,57 +6,14 @@
 
 PWD         = $(shell pwd)
 TOPDIR      = $(abspath ../../../..)
-BUILD_DIR   = ./.libs
-SYSDEP_DIR  = $(TOPDIR)/sysdep
-
-include $(SYSDEP_DIR)/Makedef.$(SCALE_FE_SYS)
-include $(TOPDIR)/Mkinclude
+FELIB_TEST_DIR = ../../
 
 BINNAME = test_field_cubedspheredom2d
+OBJS    =
 
-LIBS = $(LIBDIR)/libScaleFECore.a
-
-OBJS =
-
-all:
-	$(MAKE) envlog
-	$(MAKE) makedir
-	$(MAKE) makebin
-	$(MAKE) run
-
-makedir:
-	mkdir -p $(BUILD_DIR)
-
-makebin: $(BINNAME)
-	@echo "Complete making."
-
-run:
-	mpirun -n 1 ./$(BINNAME) test.conf
-
-vis:
-	bash ./visualize/visualize.sh
-
-$(BINNAME): $(BUILD_DIR)/$(BINNAME).o $(patsubst %,$(BUILD_DIR)/%,$(OBJS)) $(LIBS)
-	$(LD) $(LDFLAGS) $(ADDITIONAL_FFLAGS) -o $@ $^ $(LIBS) $(CONTRIB_LIBS)  $(SCALE_NETCDF_LIBS) $(SCALE_MATHLIB_LIBS) $(SCALE_PAPI_LIBS)
-
-$(BUILD_DIR)/$(BINNAME).o: $(BINNAME).f90 $(patsubst %,$(BUILD_DIR)/%,$(OBJS))
-
-distclean: clean
-	rm -f $(BINNAME)
-
-clean:
-	rm -rf $(BUILD_DIR)
-	rm -f *.nc
-
-.SUFFIXES:
-.SUFFIXES: .o .f90 .mod
-
-%.mod: %.f90
-	$(MAKE) $(patsubst %.f90,%.o,$<)
-
-$(BUILD_DIR)/%.o: %.f90
-	$(FC) $(FFLAGS) $(ADDITIONAL_FFLAGS) -DVERSION_MACRO=\"$(VERSION)\" -I$(BUILD_DIR) -I$(MODDIR) $(CONTRIB_INCLUDE) -I$(SCALEFELIBDIR)/include  $(SCALE_NETCDF_INCLUDE) $(MODDIROPT) $(BUILD_DIR) -o $@ -c $<
-
-.PHONY : clean distclean allclean
+RUNCONF         = test.conf
+TPROC           = 1
+OMP_NUM_THREADS = 1
 
-include $(TOPDIR)/utils/make/Make_environments
+#------------------------------------------------------
+include $(FELIB_TEST_DIR)/Makefile.common
diff --git a/FElib/test/FE/field_cubedspheredom3d/Makefile b/FElib/test/FE/field_cubedspheredom3d/Makefile
@@ -6,57 +6,14 @@
 
 PWD         = $(shell pwd)
 TOPDIR      = $(abspath ../../../..)
-BUILD_DIR   = ./.libs
-SYSDEP_DIR  = $(TOPDIR)/sysdep
-
-include $(SYSDEP_DIR)/Makedef.$(SCALE_FE_SYS)
-include $(TOPDIR)/Mkinclude
+FELIB_TEST_DIR = ../../
 
 BINNAME = test_field_cubedspheredom3d
+OBJS    =
 
-LIBS = $(LIBDIR)/libScaleFECore.a
-
-OBJS =
-
-all:
-	$(MAKE) envlog
-	$(MAKE) makedir
-	$(MAKE) makebin
-	$(MAKE) run
-
-makedir:
-	mkdir -p $(BUILD_DIR)
-
-makebin: $(BINNAME)
-	@echo "Complete making."
-
-run:
-	mpirun -n 1 ./$(BINNAME) test.conf
-
-vis:
-	bash ./visualize/visualize.sh
-
-$(BINNAME): $(BUILD_DIR)/$(BINNAME).o $(patsubst %,$(BUILD_DIR)/%,$(OBJS)) $(LIBS)
-	$(LD) $(LDFLAGS) $(ADDITIONAL_FFLAGS) -o $@ $^ $(LIBS) $(CONTRIB_LIBS)  $(SCALE_NETCDF_LIBS) $(SCALE_MATHLIB_LIBS) $(SCALE_PAPI_LIBS)
-
-$(BUILD_DIR)/$(BINNAME).o: $(BINNAME).f90 $(patsubst %,$(BUILD_DIR)/%,$(OBJS))
-
-distclean: clean
-	rm -f $(BINNAME)
-
-clean:
-	rm -rf $(BUILD_DIR)
-	rm -f *.nc
-
-.SUFFIXES:
-.SUFFIXES: .o .f90 .mod
-
-%.mod: %.f90
-	$(MAKE) $(patsubst %.f90,%.o,$<)
-
-$(BUILD_DIR)/%.o: %.f90
-	$(FC) $(FFLAGS) $(ADDITIONAL_FFLAGS) -DVERSION_MACRO=\"$(VERSION)\" -I$(BUILD_DIR) -I$(MODDIR) $(CONTRIB_INCLUDE) -I$(SCALEFELIBDIR)/include  $(SCALE_NETCDF_INCLUDE) $(MODDIROPT) $(BUILD_DIR) -o $@ -c $<
-
-.PHONY : clean distclean allclean
+RUNCONF         = test.conf
+TPROC           = 1
+OMP_NUM_THREADS = 1
 
-include $(TOPDIR)/utils/make/Make_environments
+#------------------------------------------------------
+include $(FELIB_TEST_DIR)/Makefile.common
diff --git a/FElib/test/FE/field_linedom1d/Makefile b/FElib/test/FE/field_linedom1d/Makefile
@@ -6,57 +6,14 @@
 
 PWD         = $(shell pwd)
 TOPDIR      = $(abspath ../../../..)
-BUILD_DIR   = ./.libs
-SYSDEP_DIR  = $(TOPDIR)/sysdep
-
-include $(SYSDEP_DIR)/Makedef.$(SCALE_FE_SYS)
-include $(TOPDIR)/Mkinclude
+FELIB_TEST_DIR = ../../
 
 BINNAME = test_field_linedom1d
+OBJS    =
 
-LIBS = $(LIBDIR)/libScaleFECore.a
-
-OBJS =
-
-all:
-	$(MAKE) envlog
-	$(MAKE) makedir
-	$(MAKE) makebin
-	$(MAKE) run
-
-makedir:
-	mkdir -p $(BUILD_DIR)
-
-makebin: $(BINNAME)
-	@echo "Complete making."
-
-run:
-	mpirun -n 1 ./$(BINNAME) test.conf
-
-vis:
-	bash ./visualize/visualize.sh
-
-$(BINNAME): $(BUILD_DIR)/$(BINNAME).o $(patsubst %,$(BUILD_DIR)/%,$(OBJS)) $(LIBS)
-	$(LD) $(LDFLAGS) $(ADDITIONAL_FFLAGS) -o $@ $^ $(LIBS) $(CONTRIB_LIBS) $(SCALE_NETCDF_LIBS) $(SCALE_MATHLIB_LIBS) $(SCALE_PAPI_LIBS)
-
-$(BUILD_DIR)/$(BINNAME).o: $(BINNAME).f90 $(patsubst %,$(BUILD_DIR)/%,$(OBJS))
-
-distclean: clean
-	rm -f $(BINNAME)
-
-clean:
-	rm -rf $(BUILD_DIR)
-	rm -f *.nc
-
-.SUFFIXES:
-.SUFFIXES: .o .f90 .mod
-
-%.mod: %.f90
-	$(MAKE) $(patsubst %.f90,%.o,$<)
-
-$(BUILD_DIR)/%.o: %.f90
-	$(FC) $(FFLAGS) $(ADDITIONAL_FFLAGS) -DVERSION_MACRO=\"$(VERSION)\" -I$(BUILD_DIR) -I$(MODDIR) $(CONTRIB_INCLUDE) -I$(SCALEFELIBDIR)/include  $(SCALE_NETCDF_INCLUDE) $(MODDIROPT) $(BUILD_DIR) -o $@ -c $<
-
-.PHONY : clean distclean allclean
+RUNCONF         = test.conf
+TPROC           = 1
+OMP_NUM_THREADS = 1
 
-include $(TOPDIR)/utils/make/Make_environments
+#------------------------------------------------------
+include $(FELIB_TEST_DIR)/Makefile.common