Skip to content

Commit

Permalink
Fix error in test
Browse files Browse the repository at this point in the history
  • Loading branch information
@hiromatsui
hiromatsui committed Jun 15, 2023
1 parent 7c00d58 commit 371fef0
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions src/programs/data_utilities/TIME_HISTORIES/compare_sph_mean_square.f90
View file
Expand Up @@ -74,7 +74,7 @@ program compare_sph_mean_square
& (sph_lbl_IN1, sph_IN1, sph_lbl_IN2, sph_IN2)
if(error) then
write(*,*) 'time sequence data header does not match'
stop 1
stop 'Check failed'
end if
!
allocate(spectr_IN1(sph_IN1%ntot_sph_spec))
Expand Down Expand Up @@ -114,10 +114,10 @@ program compare_sph_mean_square
!
if(error) then
write(*,*) 'time sequence data does not match'
stop 1
stop 'Check failed'
end if
!
stop 0
stop 'Check finished'
!
! --------------------------------------------------------------------
!
Expand Down
6 changes: 3 additions & 3 deletions tests/Dynamobench_case1/Makefile
View file
Expand Up @@ -27,9 +27,9 @@ test:
rm -f *.dat
$(MPIRUN) -np 4 $(BUILDDIR)/sph_mhd
echo 'Compare with reference mean square data'
$(BUILDDIR)/tests/sph_ene_check reference/sph_ave_volume sph_ave_volume >>& log.txt
$(BUILDDIR)/tests/sph_ene_check reference/sph_pwr_volume_s sph_pwr_volume_s >>& log.txt
$(BUILDDIR)/tests/sph_ene_check reference/sph_pwr_volume_m0 sph_pwr_volume_m0 >>& log.txt
$(BUILDDIR)/tests/sph_ene_check reference/sph_ave_volume sph_ave_volume > log.txt
$(BUILDDIR)/tests/sph_ene_check reference/sph_pwr_volume_s sph_pwr_volume_s > log.txt
$(BUILDDIR)/tests/sph_ene_check reference/sph_pwr_volume_m0 sph_pwr_volume_m0 > log.txt

clean:
rm -f *.dat *.txt rst_4/rst.*
Expand Down
8 changes: 4 additions & 4 deletions tests/Dynamobench_case2/Makefile
View file
Expand Up @@ -27,10 +27,10 @@ test:
rm -f *.dat
$(MPIRUN) -np 4 $(BUILDDIR)/sph_mhd
echo 'Compare with reference mean square data'
$(BUILDDIR)/tests/sph_ene_check reference/sph_ave_volume sph_ave_volume >>& log.txt
$(BUILDDIR)/tests/sph_ene_check reference/sph_pwr_volume_s sph_pwr_volume_s >>& log.txt
$(BUILDDIR)/tests/sph_ene_check reference/sph_pwr_volume_m0 sph_pwr_volume_m0 >>& log.txt
$(BUILDDIR)/tests/sph_ene_check reference/gauss_coefs_Re gauss_coefs_Re >>& log.txt
$(BUILDDIR)/tests/sph_ene_check reference/sph_ave_volume sph_ave_volume > log.txt
$(BUILDDIR)/tests/sph_ene_check reference/sph_pwr_volume_s sph_pwr_volume_s > log.txt
$(BUILDDIR)/tests/sph_ene_check reference/sph_pwr_volume_m0 sph_pwr_volume_m0 > log.txt
$(BUILDDIR)/tests/sph_ene_check reference/gauss_coefs_Re gauss_coefs_Re > log.txt

clean:
rm -f *.dat *.txt
Expand Down
20 changes: 10 additions & 10 deletions tests/Dynamobench_case2_cont/Makefile
View file
Expand Up @@ -26,17 +26,17 @@ all: test
test:
rm -f *.dat monitor/*.dat
$(MPIRUN) -np 4 $(BUILDDIR)/sph_mhd
$(BUILDDIR)/utilities/t_ave_monitor_data >>& log.txt
$(BUILDDIR)/utilities/t_ave_monitor_data > log.txt
echo 'Compare with reference mean square data'
$(BUILDDIR)/tests/sph_ene_check reference/sph_ave_volume monitor/sph_ave_volume >>& log.txt
$(BUILDDIR)/tests/sph_ene_check reference/sph_pwr_volume_s monitor/sph_pwr_volume_s >>& log.txt
$(BUILDDIR)/tests/sph_ene_check reference/sph_pwr_volume_m0 monitor/sph_pwr_volume_m0 >>& log.txt
$(BUILDDIR)/tests/sph_ene_check reference/gauss_coefs monitor/gauss_coefs >>& log.txt
$(BUILDDIR)/tests/sph_ene_check reference/dipolarity monitor/dipolarity >>& log.txt
$(BUILDDIR)/tests/sph_ene_check reference/dynamobench monitor/dynamobench >>& log.txt
$(BUILDDIR)/tests/sph_ene_check reference/Nusselt monitor/Nusselt >>& log.txt
$(BUILDDIR)/tests/sph_ene_check reference/sph_ave_convective monitor/sph_ave_convective >>& log.txt
$(BUILDDIR)/tests/sph_ene_check reference/sph_pwr_convective_s monitor/sph_pwr_convective_s >>& log.txt
$(BUILDDIR)/tests/sph_ene_check reference/sph_ave_volume monitor/sph_ave_volume >> log.txt
$(BUILDDIR)/tests/sph_ene_check reference/sph_pwr_volume_s monitor/sph_pwr_volume_s >> log.txt
$(BUILDDIR)/tests/sph_ene_check reference/sph_pwr_volume_m0 monitor/sph_pwr_volume_m0 >> log.txt
$(BUILDDIR)/tests/sph_ene_check reference/gauss_coefs monitor/gauss_coefs >> log.txt
$(BUILDDIR)/tests/sph_ene_check reference/dipolarity monitor/dipolarity >> log.txt
$(BUILDDIR)/tests/sph_ene_check reference/dynamobench monitor/dynamobench >> log.txt
$(BUILDDIR)/tests/sph_ene_check reference/Nusselt monitor/Nusselt >> log.txt
$(BUILDDIR)/tests/sph_ene_check reference/sph_ave_convective monitor/sph_ave_convective >> log.txt
$(BUILDDIR)/tests/sph_ene_check reference/sph_pwr_convective_s monitor/sph_pwr_convective_s >> log.txt

clean:
rm -f *.dat *.txt
Expand Down
2 changes: 1 addition & 1 deletion tests/sym_asym_field_test/Makefile
View file
Expand Up @@ -27,7 +27,7 @@ test:
rm -f *.dat
$(MPIRUN) -np 4 $(BUILDDIR)/sph_mhd
# echo 'Compare with reference mean square data'
# $(BUILDDIR)/tests/sph_ene_check sph_pwr_volume_s reference/sph_pwr_volume_s >>& log.txt
# $(BUILDDIR)/tests/sph_ene_check sph_pwr_volume_s reference/sph_pwr_volume_s >> log.txt

clean:
rm -f *.dat *.txt fort.*
Expand Down

0 comments on commit 371fef0

Please sign in to comment.